Refactored tag matching for more performant approach
Fixed issue with bullet lists losing formatting