diff --git a/src/CLI.cpp b/src/CLI.cpp
index 0b9db2a6f..1a9917b61 100644
--- a/src/CLI.cpp
+++ b/src/CLI.cpp
@@ -1672,10 +1672,11 @@ void CLI::findOperators ()
   for (a = _args.begin (); a != _args.end (); ++a)
     if (a->hasTag ("FILTER"))
       if (std::find (options.begin (), options.end (), a->attribute ("raw")) != options.end ())
-      {
-        a->tag ("OP");
-        changes = true;
-      }
+        if (! a->hasTag ("OP"))
+        {
+          a->tag ("OP");
+          changes = true;
+        }
 
   if (changes &&
       context.config.getInteger ("debug.parser") >= 3)