added filtering by tags, better category names