diff --git a/src/query/wasastringtoquery.cpp b/src/query/wasastringtoquery.cpp
index 36528e3f..2f7252db 100644
--- a/src/query/wasastringtoquery.cpp
+++ b/src/query/wasastringtoquery.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: wasastringtoquery.cpp,v 1.5 2007-02-12 18:16:08 dockes Exp $ (C) 2006 J.F.Dockes";
+static char rcsid[] = "@(#$Id: wasastringtoquery.cpp,v 1.6 2007-11-16 12:21:46 dockes Exp $ (C) 2006 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -111,7 +111,7 @@ void WasaQuery::describe(string &desc) const
  * parenthesis increases the index, but we're not interested in all
  */
 static const char * parserExpr = 
-    "([oO][rR])[[:space:]]*"        //1 OR is a special word
+    "([oO][rR]|\\|\\|)[[:space:]]*"        //1 OR,or,|| 
     "|"
     "("                              //2
       "([+-])?"                      //3 Force or exclude indicator
diff --git a/src/query/wasatorcl.cpp b/src/query/wasatorcl.cpp
index b074b1d1..b1387dc0 100644
--- a/src/query/wasatorcl.cpp
+++ b/src/query/wasatorcl.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: wasatorcl.cpp,v 1.11 2007-10-25 07:27:30 dockes Exp $ (C) 2006 J.F.Dockes";
+static char rcsid[] = "@(#$Id: wasatorcl.cpp,v 1.12 2007-11-16 12:21:46 dockes Exp $ (C) 2006 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -68,7 +68,11 @@ Rcl::SearchData *wasaQueryToRcl(WasaQuery *wasa)
 		sdata->addFiletype((*it)->m_value);
 		break;
 	    } 
-	    if (!stringicmp("rclcat", (*it)->m_fieldspec)) {
+
+	    // Xesam uses "type", we also support "rclcat", for broad
+	    // categories like "audio", "presentation", etc.
+	    if (!stringicmp("rclcat", (*it)->m_fieldspec) ||
+		!stringicmp("type", (*it)->m_fieldspec)) {
 		RclConfig *conf = RclConfig::getMainConfig();
 		list<string> mtypes;
 		if (conf && conf->getMimeCatTypes((*it)->m_value, mtypes)) {