get rid of custom restriction (so you can just use with, or even filter joins using .greater_than, etc), plus handle local_params a little more holistically