filtering by tag and some other fix?