Fixed bug where tagId was removed