Index: /trunk/src/VBox/ValidationKit/testmanager/core/testresults.py
===================================================================
--- /trunk/src/VBox/ValidationKit/testmanager/core/testresults.py	(revision 65166)
+++ /trunk/src/VBox/ValidationKit/testmanager/core/testresults.py	(revision 65167)
@@ -671,7 +671,7 @@
         (  3, 'uni', ),
         (  4, 'smp', ),
-        (  5, '-raw', ),
-        (  6, '-hw', ),
-        (  7, '-np', ),
+        (  5, 'raw', ),
+        (  6, 'hw', ),
+        (  7, 'np', ),
         (  8, 'Install', ),
         (  8, 'Benchmark', ),
@@ -838,6 +838,11 @@
                     elif iValue + 32 in oCrit.aoSelected: sNot = 'NOT ';
                     else:                                 continue;
-                    sQuery += '%s   AND %s (TestCases.sName LIKE \'%%%s%%\' OR TestCaseArgs.sSubName LIKE \'%%%s%%\')\n' \
-                            % (sExtraIndent, sNot, sLike, sLike,);
+                    sQuery += '%s   AND %s (' % (sExtraIndent, sNot,);
+                    if len(sLike) <= 3: # do word matching for small substrings (hw, np, smp, uni, ++).
+                        sQuery += 'TestCases.sName ~ \'.*\\y%s\\y.*\' OR TestCaseArgs.sSubName ~ \'.*\\y%s\\y.*\')\n' \
+                                % ( sLike, sLike,);
+                    else:
+                        sQuery += 'TestCases.sName LIKE \'%%%s%%\' OR TestCaseArgs.sSubName LIKE \'%%%s%%\')\n' \
+                                % ( sLike, sLike,);
             elif iCrit == self.kiTestboxMisc:
                 dConditions = self.kdTbMiscConditions;