tag class updated
test filtering by tag
structure refactored