Added tag choice to the ui