diff --git a/livesupport/Makefile b/livesupport/Makefile
index d3f6bef0b..a5fcc424f 100644
--- a/livesupport/Makefile
+++ b/livesupport/Makefile
@@ -20,8 +20,8 @@
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #
-#   Author   : $Author: maroy $
-#   Version  : $Revision: 1.24 $
+#   Author   : $Author: fgerlits $
+#   Version  : $Revision: 1.25 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/Attic/Makefile,v $
 #-------------------------------------------------------------------------------
 
@@ -86,6 +86,8 @@ ICU_DIR           = ${TOOLS_DIR}/icu
 ICU_VERSION       = icu-3.0
 CURL_DIR          = ${TOOLS_DIR}/curl
 CURL_VERSION      = curl-7.12.3
+TAGLIB_DIR        = ${TOOLS_DIR}/taglib
+TAGLIB_VERSION    = taglib-1.3.1
 
 MODULES_DIR           = ${BASE_DIR}/modules
 CORE_DIR              = ${MODULES_DIR}/core
@@ -167,6 +169,7 @@ tools_setup:
 	${LIBXMLXX_DIR}/${LIBXMLXX_VERSION}/bin/install.sh
 	${ICU_DIR}/${ICU_VERSION}/bin/install.sh
 	${CURL_DIR}/${CURL_VERSION}/bin/install.sh
+	${TAGLIB_DIR}/${TAGLIB_VERSION}/bin/install.sh
 
 doxytag_setup:
 	${DOXYTAG} -t ${TAGFILE} ${EXTERNAL_DOC_PAGES}
diff --git a/livesupport/modules/storage/src/WebStorageClient.cxx b/livesupport/modules/storage/src/WebStorageClient.cxx
index 09aa5347c..5d75e39e2 100644
--- a/livesupport/modules/storage/src/WebStorageClient.cxx
+++ b/livesupport/modules/storage/src/WebStorageClient.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.31 $
+    Version  : $Revision: 1.32 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/WebStorageClient.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -225,6 +225,16 @@ static const std::string    searchAudioClipResultParamName = "audioClipResults";
  *----------------------------------------------------------------------------*/
 static const std::string    searchPlaylistResultParamName = "playlistResults";
 
+/*------------------------------------------------------------------------------
+ *  The name of the audio clip count parameter returned by the method
+ *----------------------------------------------------------------------------*/
+static const std::string    searchAudioClipCountParamName = "audioClipCnt";
+
+/*------------------------------------------------------------------------------
+ *  The name of the playlist count parameter returned by the method
+ *----------------------------------------------------------------------------*/
+static const std::string    searchPlaylistCountParamName = "playlistCnt";
+
 
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ playlist methods */
 
@@ -2016,6 +2026,21 @@ WebStorageClient :: search(Ptr<SessionId>::Ref      sessionId,
         playlistIds->push_back(uniqueId);
     }
     
-    return audioClipIds->size() + playlistIds->size();
+    if (! result.hasMember(searchAudioClipCountParamName)
+            || result[searchAudioClipCountParamName].getType() 
+                                                != XmlRpcValue::TypeInt
+            || ! result.hasMember(searchPlaylistCountParamName)
+            || result[searchPlaylistCountParamName].getType() 
+                                                != XmlRpcValue::TypeInt) {
+        std::stringstream eMsg;
+        eMsg << "Missing or bad count returned by XML-RPC method '" 
+             << searchMethodName
+             << "':\n"
+             << result;
+        throw XmlRpcMethodResponseException(eMsg.str());
+    }
+
+    return int(result[searchAudioClipCountParamName])
+           + int(result[searchPlaylistCountParamName]);
 }
 
diff --git a/livesupport/tools/taglib/taglib-1.3.1/bin/install.sh b/livesupport/tools/taglib/taglib-1.3.1/bin/install.sh
new file mode 100755
index 000000000..0a46daa18
--- /dev/null
+++ b/livesupport/tools/taglib/taglib-1.3.1/bin/install.sh
@@ -0,0 +1,75 @@
+#!/bin/sh
+#-------------------------------------------------------------------------------
+#   Copyright (c) 2004 Media Development Loan Fund
+#
+#   This file is part of the LiveSupport project.
+#   http://livesupport.campware.org/
+#   To report bugs, send an e-mail to bugs@campware.org
+#
+#   LiveSupport is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   LiveSupport is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with LiveSupport; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+#
+#   Author   : $Author: fgerlits $
+#   Version  : $Revision: 1.1 $
+#   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/taglib/taglib-1.3.1/bin/Attic/install.sh,v $
+#-------------------------------------------------------------------------------                                                                                
+#-------------------------------------------------------------------------------
+# Run this script to install cppunit into the development system usr
+# environment.
+# For more information on libxml++, see http://libxmlplusplus.sourceforge.net/
+#
+# WARNING: This install script does NOT install related dependencies, like Glib.
+# To have these dependencies installed, please install GTK-- first, which
+# in fact installs all needed dependencies
+#-------------------------------------------------------------------------------
+product=taglib-1.3.1
+
+reldir=`dirname $0`/..
+basedir=`cd $reldir; pwd;`
+usrdir=`cd $basedir/../../../usr; pwd;`
+tmpdir=$basedir/tmp
+sharedir=$usrdir/share
+docdir=$sharedir/doc/taglib-1.3.1
+tar=$basedir/src/$product.tar.gz
+installdir=$usrdir
+
+export CPPFLAGS="-I$usrdir/include"
+export LDFLAGS="-L$usrdir/lib"
+export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib"
+
+
+echo "installing $product from $basedir to $installdir"
+
+
+mkdir -p $tmpdir
+cd $tmpdir
+
+tar xfz $tar
+cd $product
+./configure --prefix=$installdir
+make install
+
+# make the reference documentation and install that as well, as the
+# autoconf thing doesn't :(
+cd taglib-api
+doxygen taglib.doxygen
+cd ..
+mkdir -p $docdir
+cp -af taglib-api/* $docdir
+
+cd $basedir
+rm -rf tmp
+
diff --git a/livesupport/tools/taglib/taglib-1.3.1/src/taglib-1.3.1.tar.gz b/livesupport/tools/taglib/taglib-1.3.1/src/taglib-1.3.1.tar.gz
new file mode 100644
index 000000000..a82e4bade
Binary files /dev/null and b/livesupport/tools/taglib/taglib-1.3.1/src/taglib-1.3.1.tar.gz differ