Removed the tag select list logic according to the new structure