Add nested and/or filtering

> Yes

Done. Sorry about that (and it was cleaner in the end - I should remember this moment)