Updated tag selection functionality

Updated tagging implementation.