Adding better handling for cat and tag widgets.