should be possible to extend the on clause with a where option on nested includes