Fixed tags not populating correctly