Added ability to tag and filter by tags.