Fix tags with hyphens