diff --git a/qController/Classes/Communication/QClient.cs b/qController/Classes/Communication/QClient.cs
index 3b1a2e7..467e2b5 100644
--- a/qController/Classes/Communication/QClient.cs
+++ b/qController/Classes/Communication/QClient.cs
@@ -33,17 +33,27 @@ namespace qController.Communication
 
 
             //TODO: find a better filtering process
-            if (!args.Message.Address.Contains("update"))
+            if (!args.Message.Address.Contains("update")) 
+            {
                 qParser.ParseMessage(args.Message);
-            else if (args.Message.Address.Contains("playbackPosition") || args.Message.Address.Contains("cueList") || args.Message.Address.Contains("dashboard"))
-                qParser.ParseMessage(args.Message);
-            else if (args.Message.Address.Contains("cue_id"))
+            }
+            else if (args.Message.Address.Contains("playbackPosition") || args.Message.Address.Contains("cueList") || args.Message.Address.Contains("dashboard"))
+            {
+                qParser.ParseMessage(args.Message);
+            }
+            else if (args.Message.Address.Contains("cue_id")) 
             {
                 var parts = args.Message.Address.Split('/');
                 UpdateSpecificCue(parts[3], parts[5]);
-            }
-            else
+            } 
+            else if (args.Message.Address.EndsWith("update"))
+            {
                 ProcessUpdate(args.Message);
+            } 
+            else
+            {
+                Log.Warning("QCLIENT - Unhandled address: " + args.Message.Address);
+            }
         }
 
         public void sendTCP(string address)