diff --git a/examples/query.rs b/examples/query.rs
index 04593a16..a467f93a 100644
--- a/examples/query.rs
+++ b/examples/query.rs
@@ -36,14 +36,18 @@ fn main() {
         match event {
             ServiceEvent::ServiceResolved(info) => {
                 println!(
-                    "At {:?}: Resolved a new service: {} host: {} port: {} IP: {:?} TXT properties: {:?}",
+                    "At {:?}: Resolved a new service: {}\n host: {}\n port: {}",
                     now.elapsed(),
                     info.get_fullname(),
                     info.get_hostname(),
                     info.get_port(),
-                    info.get_addresses(),
-                    info.get_properties(),
                 );
+                for addr in info.get_addresses().iter() {
+                    println!(" Address: {}", addr);
+                }
+                for prop in info.get_properties().iter() {
+                    println!(" Property: {}", prop);
+                }
             }
             other_event => {
                 println!("At {:?} : {:?}", now.elapsed(), &other_event);
diff --git a/examples/register.rs b/examples/register.rs
index ff94d4c6..5d29e84d 100644
--- a/examples/register.rs
+++ b/examples/register.rs
@@ -44,7 +44,7 @@ fn main() {
     // With `enable_addr_auto()`, we can give empty addrs and let the lib find them.
     // If the caller knows specific addrs to use, then assign the addrs here.
     let my_addrs = "";
-    let service_hostname = "mdns-example.local.";
+    let service_hostname = format!("{}{}", instance_name, &service_type);
     let port = 3456;
 
     // The key string in TXT properties is case insensitive. Only the first
@@ -55,7 +55,7 @@ fn main() {
     let service_info = ServiceInfo::new(
         &service_type,
         instance_name,
-        service_hostname,
+        &service_hostname,
         my_addrs,
         port,
         &properties[..],