Fixed rendering issues with HTML entities