- Fix deprecated usage of multi-value annotations
- Fix paragraph behaviour