TagBox few changes