Fixes for Taxonomy widget bugs