Improve cosmetics
Extend use of tags