Hola Martín,
When this case gets complicated due to new conditionals appearing, I prefer to use this short JS code to handle the logic and use the value “true” as a filter parameter in Glide components.
Something like this:
if ((p1 == "EXPENSE") && (p2 == "yourRowID" || p2 == ""))
return true
just play with the conditional AND (&&) / OR (||) by putting your cases in the IF statement to create an easy-to-understand logic
An If-Then-Else column using more than 4-5 combinations (with AND/OR mixtures) can drive anyone crazy 
Saludos!