diff --git a/src/lib.rs b/src/lib.rs
index c168075..8cd9dba 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -126,11 +126,11 @@ pub fn datapoint_from_sourcedata(
         builder = builder.tag(key, value)
     }
     builder = builder
-        .tag("ip", d.ip_addr.to_string())
+        .tag("ref_id", d.ip_addr.to_string())
+        .tag("mode", (d.mode as i64).to_string())
+        .tag("state", (d.state as i64).to_string())
         .field("poll", d.poll as i64)
         .field("stratum", d.stratum as i64)
-        .field("state", d.state as i64)
-        .field("mode", d.mode as i64)
         .field("flags", d.flags.bits() as i64)
         .field("reachability", d.reachability as i64)
         .field("since_sample", d.since_sample as i64)