Augmented Dummy Classes; Tweaked Category Filter