Fixed HTML escaped names in Yr