David Piepgrass I finally implemented the changes suggested. It was easier than expected and it does improve several scenarios. You can check it at https://github.com/NetFabric/NetFabric.Hyperlinq/issues/8