diff --git a/livesupport/modules/storageServer/var/GreenBox.php b/livesupport/modules/storageServer/var/GreenBox.php
index 7a43f6af1..c8ac59954 100644
--- a/livesupport/modules/storageServer/var/GreenBox.php
+++ b/livesupport/modules/storageServer/var/GreenBox.php
@@ -23,7 +23,7 @@
 
 
     Author   : $Author: tomas $
-    Version  : $Revision: 1.50 $
+    Version  : $Revision: 1.51 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/GreenBox.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -35,7 +35,7 @@ require_once "BasicStor.php";
  *  LiveSupport file storage module
  *
  *  @author  $Author: tomas $
- *  @version $Revision: 1.50 $
+ *  @version $Revision: 1.51 $
  *  @see BasicStor
  */
 class GreenBox extends BasicStor{
@@ -107,7 +107,7 @@ class GreenBox extends BasicStor{
         );
         if(PEAR::isError($oid)) return $oid;
         $r = $this-> bsSetMetadataValue(
-            $oid, 'ls:url', $url, NULL, NULL, 'audioClip');
+            $oid, 'ls:url', $url, NULL, NULL, 'metadata');
         if(PEAR::isError($r)) return $r;
         return $oid;
     }
diff --git a/livesupport/modules/storageServer/var/LocStor.php b/livesupport/modules/storageServer/var/LocStor.php
index 4a7cac199..2ad3c4085 100644
--- a/livesupport/modules/storageServer/var/LocStor.php
+++ b/livesupport/modules/storageServer/var/LocStor.php
@@ -23,7 +23,7 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.36 $
+    Version  : $Revision: 1.37 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/LocStor.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -158,7 +158,7 @@ class LocStor extends BasicStor{
         if(PEAR::isError($ac)) return $ac;
         $oid = $ac->getId();
         $r = $this-> bsSetMetadataValue(
-            $oid, 'ls:url', $url, NULL, NULL, 'audioClip');
+            $oid, 'ls:url', $url, NULL, NULL, 'metadata');
         if(PEAR::isError($r)) return $r;
         return $gunid;
     }
diff --git a/livesupport/modules/storageServer/var/tests/wstream1.xml b/livesupport/modules/storageServer/var/tests/wstream1.xml
index 42c4c560b..5edf01e1e 100644
--- a/livesupport/modules/storageServer/var/tests/wstream1.xml
+++ b/livesupport/modules/storageServer/var/tests/wstream1.xml
@@ -9,6 +9,6 @@
     >
         <dc:title>Webstream test 1</dc:title>
         <dcterms:extent>01:30:00.000000</dcterms:extent>
+        <ls:url>http://localhost/y</ls:url>
     </metadata>
-    <ls:url>http://localhost/y</ls:url>
 </audioclip>
diff --git a/livesupport/modules/storageServer/var/webstreamFormat.php b/livesupport/modules/storageServer/var/webstreamFormat.php
index ad21cbc41..709bdd34d 100644
--- a/livesupport/modules/storageServer/var/webstreamFormat.php
+++ b/livesupport/modules/storageServer/var/webstreamFormat.php
@@ -23,7 +23,7 @@
 
 
     Author   : $Author: tomas $
-    Version  : $Revision: 1.1 $
+    Version  : $Revision: 1.2 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/webstreamFormat.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -32,13 +32,13 @@ $webstreamFormat = array(
     '_root'=>'audioclip',
     'audioclip'=>array(
         'childs'=>array(
-            'required'=>array('metadata', 'ls:url'),
+            'required'=>array('metadata'),
         ),
     ),
     'metadata'=>array(
         'childs'=>array(
             'required'=>array(
-                'dc:title', 'dcterms:extent'
+                'dc:title', 'dcterms:extent', 'ls:url'
             ),
             'optional'=>array(
                 'dc:identifier',