Filter a List Using Different Criteria

In C6:

=SORT(UNIQUE(FILTER(Test!H2:I1694,(Test!C2:C1694=C2)*((Test!N2:N1694+Test!P2:P1694)>0))))

In E6 copied down:

=LET(s,SUMIFS(Test!$N$2:$N$1694,Test!$C$2:$C$1694,$C$2,Test!$H$2:$H$1694,C6,Test!$I$2:$I$1694,D6),
IF(s=0,"",s))

In F6 copied down:

=LET(s,SUMIFS(Test!$P$2:$P$1694,Test!$C$2:$C$1694,$C$2,Test!$H$2:$H$1694,C6,Test!$I$2:$I$1694,D6),
IF(s=0,"",s))

In H6:

=SORT(FILTER(B6:E22,((D6:D22="Diesel")+(D6:D22="Diesel to Petrol"))*(E6:E22<>0)),2)

In M6:

=SORT(FILTER(B6:E22,(D6:D22="Diesel")*(E6:E22<>0)),2)

In R6:

=SORT(FILTER(B6:E22,(D6:D22="Diesel to Petrol")*(E6:E22<>0)),2)

In W6:

=SORT(FILTER(B6:E22,(D6:D22="Petrol")*(E6:E22<>0)),2)