More fixes for Tag widget.