--- ZSQLExtend/ZSQLExtend.py	2004/06/11 14:23:28	1.18
+++ ZSQLExtend/ZSQLExtend.py	2004/06/11 16:54:29	1.20
@@ -156,9 +156,9 @@ class ZSQLExtendFolder(Persistent, Impli
         ret=""
         for field in fields:
             if checked and (field in checked.split("\n")):
-                ret+="""<input name="%s" type="%s" value="%s" checked>%s"""%(fieldname,boxType,field,field)
+                ret+="""<input name="%s" type="%s" value="%s" checked>%s"""%(fieldname,boxType,field.encode('utf-8'),field.encode('utf-8'))
             else:
-                ret+="""<input name="%s" type="%s" value="%s">%s"""%(fieldname,boxType,field,field)
+                ret+="""<input name="%s" type="%s" value="%s">%s"""%(fieldname,boxType,field.encode('utf-8'),field.encode('utf-8'))
         return ret
 
 
@@ -168,7 +168,7 @@ class ZSQLExtendFolder(Persistent, Impli
         ret="""<select name="%s">
             """%fieldname
         for field in fields:
-            ret+="""<option value="%s">%s</option>"""%(field,field)
+            ret+="""<option value="%s">%s</option>"""%(field.encode('utf-8'),field.encode('utf-8'))
         ret+="""</select>"""
         return ret
 
@@ -178,6 +178,8 @@ class ZSQLExtendFolder(Persistent, Impli
         ret="""<select name="%s">
             """%fieldname
         if start:
+	    if start==' ':
+		start=''
             ret+="""<option value="%s">%s</option>"""%(start,start)
         for result in results:
             field=getattr(result,fieldName)