Changed the tag select list according to the new structure