This message was deleted.

Thanks for the contribution! At first glance the PR looks good. I'll do some testing today to make sure it handles different edge cases and doesn't break any existing queries.