Fix bug with metadata tags