diff --git a/src/CLI.cpp b/src/CLI.cpp
index 674191a4b..105409f05 100644
--- a/src/CLI.cpp
+++ b/src/CLI.cpp
@@ -345,13 +345,13 @@ void CLI::analyze (bool parse /* = true */)
   if (parse)
   {
     // Remove all the syntactic sugar for FILTERs.
+    findIDs ();
+    findUUIDs ();
+    insertIDExpr ();
     desugarTags ();
     desugarAttributes ();
     desugarAttributeModifiers ();
     desugarPatterns ();
-    findIDs ();
-    findUUIDs ();
-    insertIDExpr ();
     findOperators ();
     findAttributes ();
     insertJunctions ();