Remove overflow for tags
Merge pull request #1112 from vrutkovs/tags-overflow

Remove overflow for tags