Added refactoring Tag-API & Tag-Controller