istream xxx: fix + new categories