True, and happy to do that, was just trying not to require that dependency since this is the only complicated query.  What do you think?  Worth adding the dependency to reduce the code?