diff --git a/Cargo.lock b/Cargo.lock
index 08904be..952bbf6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4320,7 +4320,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "ahash",
  "async-trait",
@@ -4417,7 +4417,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "zenoh-collections",
 ]
@@ -4425,7 +4425,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "tracing",
  "uhlc",
@@ -4436,12 +4436,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "json5",
  "num_cpus",
@@ -4462,7 +4462,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -4473,7 +4473,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "aes 0.8.4",
  "hmac 0.12.1",
@@ -4486,7 +4486,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "hashbrown",
  "keyed-set",
@@ -4500,7 +4500,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -4517,7 +4517,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "async-trait",
  "flume",
@@ -4540,7 +4540,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4565,7 +4565,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4582,7 +4582,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4609,7 +4609,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4628,7 +4628,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "async-trait",
  "nix",
@@ -4646,7 +4646,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4666,7 +4666,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4677,7 +4677,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "git-version",
  "libloading",
@@ -4693,7 +4693,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4707,7 +4707,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "anyhow",
 ]
@@ -4715,7 +4715,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "lazy_static",
  "ron",
@@ -4728,7 +4728,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "event-listener 5.3.1",
  "futures",
@@ -4741,7 +4741,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "futures",
  "tokio",
@@ -4754,7 +4754,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4787,7 +4787,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "async-trait",
  "const_format",
@@ -4812,7 +4812,7 @@ dependencies = [
 [[package]]
 name = "zenoh_backend_traits"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8b2566e543a17e368708874f73789065ca4c5c5c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ddcc8f1d8c114ca256df3939c303bcbdc1f80197"
 dependencies = [
  "async-trait",
  "const_format",
diff --git a/v1/src/lib.rs b/v1/src/lib.rs
index 38b0791..ad3896a 100644
--- a/v1/src/lib.rs
+++ b/v1/src/lib.rs
@@ -917,7 +917,7 @@ fn clauses_from_parameters(p: &str) -> ZResult<String> {
         }
     };
     match time_range {
-        Ok(TimeRange(start, stop)) => {
+        Ok(TimeRange { start, end }) => {
             match start {
                 TimeBound::Inclusive(t) => {
                     result.push_str(" AND time >= ");
@@ -929,7 +929,7 @@ fn clauses_from_parameters(p: &str) -> ZResult<String> {
                 }
                 TimeBound::Unbounded => {}
             }
-            match stop {
+            match end {
                 TimeBound::Inclusive(t) => {
                     result.push_str(" AND time <= ");
                     write_timeexpr(&mut result, t);
diff --git a/v2/src/lib.rs b/v2/src/lib.rs
index c4dab90..9d891bc 100644
--- a/v2/src/lib.rs
+++ b/v2/src/lib.rs
@@ -998,7 +998,7 @@ fn timerange_from_parameters(p: &str) -> ZResult<Option<String>> {
 
     let mut result = String::new();
     match time_range {
-        Ok(TimeRange(start, stop)) => {
+        Ok(TimeRange { start, end }) => {
             match start {
                 TimeBound::Inclusive(t) => {
                     result.push_str("start:");
@@ -1012,7 +1012,7 @@ fn timerange_from_parameters(p: &str) -> ZResult<Option<String>> {
                     result.push_str("start:0");
                 }
             }
-            match stop {
+            match end {
                 TimeBound::Inclusive(t) => {
                     result.push_str(", stop:");
                     write_timeexpr(&mut result, t, 1);