Merge "Fix markup for audio pages: tags, entities, etc"