Refined TagEditForm some more