better filtering by subclass