diff --git a/livesupport/modules/widgets/src/OperatorComboBoxText.cxx b/livesupport/modules/widgets/src/OperatorComboBoxText.cxx
index 4e006da70..26c3b9619 100644
--- a/livesupport/modules/widgets/src/OperatorComboBoxText.cxx
+++ b/livesupport/modules/widgets/src/OperatorComboBoxText.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.1 $
+    Version  : $Revision: 1.2 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/src/OperatorComboBoxText.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -62,16 +62,21 @@ OperatorComboBoxText :: OperatorComboBoxText(
         : ComboBoxText(leftImage, centerImage, rightImage),
           LocalizedObject(bundle)
 {
-    appendPair(getResourceUstring("partialOperatorDisplay"),
-               getResourceUstring("partialOperatorSearchKey"));
-    appendPair(getResourceUstring("prefixOperatorDisplay"),
-               getResourceUstring("prefixOperatorSearchKey"));
-    appendPair(getResourceUstring("=OperatorDisplay"),
-               getResourceUstring("=OperatorSearchKey"));
-    appendPair(getResourceUstring("<=OperatorDisplay"),
-               getResourceUstring("<=OperatorSearchKey"));
-    appendPair(getResourceUstring(">=OperatorDisplay"),
-               getResourceUstring(">=OperatorSearchKey"));
+    Ptr<Glib::ustring>::Ref   searchOperator(new Glib::ustring("partial"));
+    appendPair(getResourceUstring("partialOperatorDisplay"), searchOperator);
+
+    *searchOperator = "prefix";
+    appendPair(getResourceUstring("prefixOperatorDisplay"), searchOperator);
+
+    *searchOperator = "=";
+    appendPair(getResourceUstring("=OperatorDisplay"), searchOperator);
+
+    *searchOperator = "<=";
+    appendPair(getResourceUstring("<=OperatorDisplay"), searchOperator);
+
+    *searchOperator = ">=";
+    appendPair(getResourceUstring(">=OperatorDisplay"), searchOperator);
+
     set_active(0);  // select the first item
 }
 
diff --git a/livesupport/products/gLiveSupport/src/SearchWindow.cxx b/livesupport/products/gLiveSupport/src/SearchWindow.cxx
index 9336e7fe3..ea82addd6 100644
--- a/livesupport/products/gLiveSupport/src/SearchWindow.cxx
+++ b/livesupport/products/gLiveSupport/src/SearchWindow.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.18 $
+    Version  : $Revision: 1.19 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SearchWindow.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -316,10 +316,15 @@ void
 SearchWindow :: onSearch(Ptr<SearchCriteria>::Ref   criteria)
                                                                 throw ()
 {
-    Ptr<std::list<Ptr<Playable>::Ref> >::Ref
-            searchResults = gLiveSupport->search(criteria);
-    std::list<Ptr<Playable>::Ref>::const_iterator it;
+    Ptr<std::list<Ptr<Playable>::Ref> >::Ref searchResults;
+    try {
+        searchResults = gLiveSupport->search(criteria);
+    } catch (XmlRpcException &e) {
+        std::cerr << e.what() << std::endl;
+        return;
+    }
 
+    std::list<Ptr<Playable>::Ref>::const_iterator it;
     treeModel->clear();
     int     rowNumber = 0;
     
diff --git a/livesupport/products/gLiveSupport/var/es.txt b/livesupport/products/gLiveSupport/var/es.txt
index ff867c82c..82182e00c 100644
--- a/livesupport/products/gLiveSupport/var/es.txt
+++ b/livesupport/products/gLiveSupport/var/es.txt
@@ -152,15 +152,10 @@ es:table
         lengthColumnLabel:string      { "Duración" }
         
         partialOperatorDisplay:string     { "contiene" }
-        partialOperatorSearchKey:string   { "parcial" }
         prefixOperatorDisplay:string      { "empieza con" }
-        prefixOperatorSearchKey:string    { "prefix" }
         =OperatorDisplay:string           { "equivale" }
-        =OperatorSearchKey:string         { "=" }
         <=OperatorDisplay:string          { "<=" }
-        <=OperatorSearchKey:string        { "<=" }
         >=OperatorDisplay:string          { ">=" }
-        >=OperatorSearchKey:string        { ">=" }
         
         allStringForBrowse                { "--- todo ---" }
         
diff --git a/livesupport/products/gLiveSupport/var/hu.txt b/livesupport/products/gLiveSupport/var/hu.txt
index 167ab838d..a1bbf6fe2 100644
--- a/livesupport/products/gLiveSupport/var/hu.txt
+++ b/livesupport/products/gLiveSupport/var/hu.txt
@@ -150,15 +150,10 @@ hu:table
         lengthColumnLabel:string      { "Hossz" }
         
         partialOperatorDisplay:string     { "része" }
-        partialOperatorSearchKey:string   { "partial" }
         prefixOperatorDisplay:string      { "kezdete" }
-        prefixOperatorSearchKey:string    { "prefix" }
         =OperatorDisplay:string           { "=" }
-        =OperatorSearchKey:string         { "=" }
         <=OperatorDisplay:string          { "<=" }
-        <=OperatorSearchKey:string        { "<=" }
         >=OperatorDisplay:string          { ">=" }
-        >=OperatorSearchKey:string        { ">=" }
 
         allStringForBrowse                { "--- minden ---" }
         
diff --git a/livesupport/products/gLiveSupport/var/root.txt b/livesupport/products/gLiveSupport/var/root.txt
index 1ea0875a0..9436e72d8 100644
--- a/livesupport/products/gLiveSupport/var/root.txt
+++ b/livesupport/products/gLiveSupport/var/root.txt
@@ -152,15 +152,10 @@ root:table
         lengthColumnLabel:string      { "Length" }
         
         partialOperatorDisplay:string     { "contains" }
-        partialOperatorSearchKey:string   { "partial" }
         prefixOperatorDisplay:string      { "starts with" }
-        prefixOperatorSearchKey:string    { "prefix" }
         =OperatorDisplay:string           { "equals" }
-        =OperatorSearchKey:string         { "=" }
         <=OperatorDisplay:string          { "<=" }
-        <=OperatorSearchKey:string        { "<=" }
         >=OperatorDisplay:string          { ">=" }
-        >=OperatorSearchKey:string        { ">=" }
         
         allStringForBrowse                { "--- all ---" }
         
diff --git a/livesupport/products/gLiveSupport/var/sr_CS.txt b/livesupport/products/gLiveSupport/var/sr_CS.txt
index 0a054fb5e..833a6db36 100644
--- a/livesupport/products/gLiveSupport/var/sr_CS.txt
+++ b/livesupport/products/gLiveSupport/var/sr_CS.txt
@@ -152,15 +152,10 @@ sr_CS:table
         lengthColumnLabel:string      { "Dužina" }
         
         partialOperatorDisplay:string     { "sadrži" }
-        partialOperatorSearchKey:string   { "deo" }
         prefixOperatorDisplay:string      { "počinje sa" }
-        prefixOperatorSearchKey:string    { "prefiks" }
         =OperatorDisplay:string           { "jednako" }
-        =OperatorSearchKey:string         { "=" }
         <=OperatorDisplay:string          { "<=" }
-        <=OperatorSearchKey:string        { "<=" }
         >=OperatorDisplay:string          { ">=" }
-        >=OperatorSearchKey:string        { ">=" }
         
         allStringForBrowse                { "--- sve ---" }
         
diff --git a/livesupport/products/gLiveSupport/var/sr_CS_CYRILLIC.txt b/livesupport/products/gLiveSupport/var/sr_CS_CYRILLIC.txt
index 6817d96ea..3d9eb21c3 100644
--- a/livesupport/products/gLiveSupport/var/sr_CS_CYRILLIC.txt
+++ b/livesupport/products/gLiveSupport/var/sr_CS_CYRILLIC.txt
@@ -151,15 +151,10 @@ sr_CS_CYRILLIC:table
         lengthColumnLabel:string      { "Дужина" }
         
         partialOperatorDisplay:string     { "садржи" }
-        partialOperatorSearchKey:string   { "део" }
         prefixOperatorDisplay:string      { "почиње са" }
-        prefixOperatorSearchKey:string    { "префикс" }
         =OperatorDisplay:string           { "једнако" }
-        =OperatorSearchKey:string         { "=" }
         <=OperatorDisplay:string          { "<=" }
-        <=OperatorSearchKey:string        { "<=" }
         >=OperatorDisplay:string          { ">=" }
-        >=OperatorSearchKey:string        { ">=" }
         
         allStringForBrowse                { "--- све ---" }