Refactoring
Fixed tag counter cache
Refactoring