Fix bug with empty tags