Added subtype list filter