diff --git a/en_US.ISO8859-1/htdocs/multimedia/multimedia.pl b/en_US.ISO8859-1/htdocs/multimedia/multimedia.pl
index 0f92f7c53a..f125e99de3 100644
--- a/en_US.ISO8859-1/htdocs/multimedia/multimedia.pl
+++ b/en_US.ISO8859-1/htdocs/multimedia/multimedia.pl
@@ -83,7 +83,7 @@ sub xml_start {
 	$items[$ci]{fc}++;
     }
 
-    if ($treeindex == 3 &&
+    if (($treeindex == 3 || $treeindex == 5) &&
 	$element eq "tags") {
 	$tag = "";
     }
@@ -98,6 +98,11 @@ sub xml_end {
 	@{$items[$ci]{tags}} = split(/,/, $tag);
 	addtags($tag);
     }
+    if ($treeindex == 5 &&
+	$element eq "tags") {
+	@{$items[$ci]{files}{$items[$ci]{fc}}{tags}} = split(/,/, $tag);
+	addtags($tag);
+    }
 
     $values[$treeindex] = ();
     $treeindex--;
@@ -179,9 +184,7 @@ sub xml_char {
 			    return;
 			}
 			if ($tree[5] eq "tags") {
-			    @{$items[$ci]{files}{$items[$ci]{fc}}{tags}} = split(/,/, $value);
-			    addtags($value);
-			    addtags("", $items[$ci]{tags});
+			    $tag .= $value;
 			    return;
 			}
 			goto error;
@@ -432,7 +435,7 @@ sub print_htmlitem {
     }
     my $size = 20;
     my $c = 0;
-    foreach my $tag (sort size(keys(%tags))) {
+    foreach my $tag (sort size keys(%tags)) {
 	my $ftag = $tag;
 	$ftag =~ s/ /_/g;
 	print $fhtml "<font style=\"font-size:${size}pt\"><a href=\"tag-$ftag.html\">$tag</a></font>\n";