[WIP] PIM-3308: fix unclassified filter