tags update

* handle xx tag
* bugfixes
* seperate tags to another file