Fixed a bug with tags, data refactoring, WIP