fixing sub class filtering