Merge pull request #8139 from ghalliday/issue14811

HPCC-14811 Avoid duplicating annotations on expressions

Reviewed-By: Jamie Noss <james.noss@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

ecl/hql/hqlexpr.cpp

@@ -8809,7 +8809,10 @@ public:
             if (expr->queryChild(1) == searchModule)
             {
                 IIdAtom * id = expr->queryChild(3)->queryId();
-                return getVirtualReplacement(id);
+                OwnedHqlExpr replacement = getVirtualReplacement(id);
+                if (expr == replacement->queryBody())
+                    return LINK(expr);
+                return replacement.getClear();
             }
             break;
         }