Subtype only filter, small refactorings