TaxonomyField minor fixes