Better HTML entities handling