diff --git a/measure_definitions/diltiazem.yaml b/measure_definitions/diltiazem.yaml
index e25e55e3..17fc0e15 100644
--- a/measure_definitions/diltiazem.yaml
+++ b/measure_definitions/diltiazem.yaml
@@ -18,16 +18,18 @@ output:
   denominator: items
 queries:
   - numerator:
+      product_type: generic
       bnf_codes:
         included:
-          - "0206020C0AA" # Diltiazem (generic)
+          - "0206020C0" # Diltiazem
         excluded:
-          - "00206020C0AAAAAA" # Diltiazem 60mg modified-release tablets
-          - "00206020C0AAAJAJ" # Diltiazem 60mg modified-release capsules          
+          - "0206020C0_AA" # Diltiazem 60mg modified-release tablets
+          - "0206020C0_AJ" # Diltiazem 60mg modified-release capsules
     denominator:
+      product_type: all # (branded and generic)
       bnf_codes:
         included:
-          - "0206020C0" # Diltiazem (brand and generic)
-        excluded: 
-          - "0206020C0%AA" # Diltiazem 60mg modified-release tablets (brand and generic)
-          - "0206020C0%AJ" # Diltiazem 60mg modified-release capsules (brand and generic)
+          - "0206020C0" # Diltiazem
+        excluded:
+          - "0206020C0_AA" # Diltiazem 60mg modified-release tablets
+          - "0206020C0_AJ" # Diltiazem 60mg modified-release capsules