Added advanced editing, filtering by tag