WIP: Fix Taxonomy Widget Logic

#4424
#4255