TaxonomyPicker improvement