[fix] don't add empty tags
[fix] correctly separate tags