diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml
index 1bbde61..83aa573 100755
--- a/trunk/locale/en-us.xml
+++ b/trunk/locale/en-us.xml
@@ -71,6 +71,8 @@
     <string id="error_upload_duplicate">Video has already been uploaded</string>
     <string id="error_upload_file_too_small">The filesize of the video you uploaded is too small</string>
     <string id="error_upload_file_too_big">The filesize of the video you uploaded is too big</string>
+    <string id="error_upload_video_width_too_small">The width of the video you uploaded is too small</string>
+    <string id="error_upload_video_height_too_small">The height of the video you uploaded is too small</string>
     <string id=""></string>
 
     <!-- information -->
diff --git a/trunk/locale/languages.xml b/trunk/locale/languages.xml
index d650333..8b9af7f 100644
--- a/trunk/locale/languages.xml
+++ b/trunk/locale/languages.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <languages>
+  <lang>
+    <short></short>
+    <name lang="en">Undefined</name>
+  </lang>
   <lang>
     <short>aa</short>
     <name lang="en">Afar</name>
diff --git a/trunk/upload.pl b/trunk/upload.pl
index e56d28b..acfd90d 100644
--- a/trunk/upload.pl
+++ b/trunk/upload.pl
@@ -28,7 +28,7 @@ if($userinfo->{'username'})
         @unique{ @subject } = ();
         foreach $tag (keys %unique)
         {
-            if(length($tag) >= 3)
+            if(length($tag) >= $config->{"page_tag_lenght_min"})
             {
                 $subject.=$tag." ";
             }
diff --git a/trunk/xsl/xhtml/upload.xsl b/trunk/xsl/xhtml/upload.xsl
index 5303eb4..c151c06 100644
--- a/trunk/xsl/xhtml/upload.xsl
+++ b/trunk/xsl/xhtml/upload.xsl
@@ -273,20 +273,17 @@
 
                         <xsl:value-of select="$locale_strings[@id='instruction_language']" />
                         <br />
-
+                        
+                        <!-- somehow one cannot access DC.Language from inside the for-each... -->
+                        <xsl:variable name="language" select="//uploadform/@DC.Language" />
                         <select name="DC.Language" size="1">
                             <xsl:for-each select="$language_strings">
                                 <option>
                                     <xsl:variable name="short" select="short" />
-                                    <xsl:if test="//uploadform/@DC.Language=short">
-                                        <!-- never executed, plz fix -->
-                                        <xsl:attribute name="selected">
-                                            selected
-                                        </xsl:attribute>
+                                    <xsl:if test="$short=$language">
+                                        <xsl:attribute name="selected">selected</xsl:attribute>
                                     </xsl:if>
-                                    <xsl:attribute name="value">
-                                        <xsl:value-of select="$short" />
-                                    </xsl:attribute>
+                                    <xsl:attribute name="value"><xsl:value-of select="$short" /></xsl:attribute>
                                     <xsl:value-of select="name[@lang='en']" /><!-- language hardcoded to en - plz fix this -->
                                     (<xsl:value-of select="name[@lang=$short]" />)
                                 </option>