(#65143126) make tags without underscores

https://www.pivotaltracker.com/story/show/65143126