Fix "angiotensinblocker" counter. Fix merge of medication classes.