Merge development

- Update HMAC calculation
- fix(subcategories): handle missing subcategories