diff --git a/src/Makefile.dep b/src/Makefile.dep
index 2a1bf2a..9a673e1 100644
--- a/src/Makefile.dep
+++ b/src/Makefile.dep
@@ -3,8 +3,8 @@
 baseexpression.o: baseexpression.h ../../pikotools/textstream/textstream.h
 baseexpression.o: ../../pikotools/space/space.h
 baseexpression.o: ../../pikotools/textstream/types.h
-baseexpression.o: ../../pikotools/date/date.h
 baseexpression.o: ../../pikotools/convert/inttostr.h
+baseexpression.o: ../../pikotools/date/date.h
 baseexpression.o: ../../pikotools/membuffer/membuffer.h
 baseexpression.o: ../../pikotools/textstream/types.h morm_types.h modelenv.h
 baseexpression.o: modeldata.h cursorhelper.h queryresult.h
@@ -12,6 +12,8 @@ baseexpression.o: ../../pikotools/log/log.h ../../pikotools/log/filelog.h
 baseexpression.o: finderhelper.h fieldvaluehelper.h ft.h model.h
 baseexpression.o: modelconnector.h clearer.h dbconnector.h flatconnector.h
 baseexpression.o: dbexpression.h flatexpression.h ../../pikotools/utf8/utf8.h
+baseexpression.o: ../../pikotools/utf8/utf8_templates.h
+baseexpression.o: ../../pikotools/utf8/utf8_private.h
 clearer.o: clearer.h ../../pikotools/date/date.h
 clearer.o: ../../pikotools/convert/inttostr.h ../../pikotools/space/space.h
 clearer.o: ../../pikotools/textstream/types.h model.h
@@ -24,17 +26,20 @@ clearer.o: morm_types.h modelenv.h modeldata.h cursorhelper.h finderhelper.h
 clearer.o: fieldvaluehelper.h ft.h flatexpression.h
 dbconnector.o: ../../pikotools/space/spaceparser.h
 dbconnector.o: ../../pikotools/space/space.h
-dbconnector.o: ../../pikotools/textstream/types.h dbconnector.h
+dbconnector.o: ../../pikotools/textstream/types.h
+dbconnector.o: ../../pikotools/convert/inttostr.h dbconnector.h
 dbconnector.o: ../../pikotools/textstream/textstream.h
 dbconnector.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
-dbconnector.o: ../../pikotools/convert/inttostr.h
 dbconnector.o: ../../pikotools/membuffer/membuffer.h
 dbconnector.o: ../../pikotools/textstream/types.h ../../pikotools/log/log.h
 dbconnector.o: ../../pikotools/log/filelog.h queryresult.h dbexpression.h
 dbconnector.o: baseexpression.h morm_types.h modelenv.h modeldata.h
 dbconnector.o: cursorhelper.h finderhelper.h fieldvaluehelper.h ft.h model.h
 dbconnector.o: modelconnector.h clearer.h flatconnector.h flatexpression.h
-dbconnector.o: ../../pikotools/utf8/utf8.h ../../pikotools/convert/convert.h
+dbconnector.o: ../../pikotools/utf8/utf8.h
+dbconnector.o: ../../pikotools/utf8/utf8_templates.h
+dbconnector.o: ../../pikotools/utf8/utf8_private.h
+dbconnector.o: ../../pikotools/convert/convert.h
 dbconnector.o: ../../pikotools/convert/inttostr.h
 dbconnector.o: ../../pikotools/convert/patternreplacer.h
 dbconnector.o: ../../pikotools/convert/strtoint.h
@@ -43,8 +48,8 @@ dbexpression.o: dbexpression.h baseexpression.h
 dbexpression.o: ../../pikotools/textstream/textstream.h
 dbexpression.o: ../../pikotools/space/space.h
 dbexpression.o: ../../pikotools/textstream/types.h
-dbexpression.o: ../../pikotools/date/date.h
 dbexpression.o: ../../pikotools/convert/inttostr.h
+dbexpression.o: ../../pikotools/date/date.h
 dbexpression.o: ../../pikotools/membuffer/membuffer.h
 dbexpression.o: ../../pikotools/textstream/types.h morm_types.h modelenv.h
 dbexpression.o: modeldata.h cursorhelper.h queryresult.h
@@ -53,8 +58,8 @@ dbexpression.o: finderhelper.h fieldvaluehelper.h ft.h
 flatconnector.o: flatconnector.h ../../pikotools/textstream/textstream.h
 flatconnector.o: ../../pikotools/space/space.h
 flatconnector.o: ../../pikotools/textstream/types.h
-flatconnector.o: ../../pikotools/date/date.h
 flatconnector.o: ../../pikotools/convert/inttostr.h
+flatconnector.o: ../../pikotools/date/date.h
 flatconnector.o: ../../pikotools/membuffer/membuffer.h
 flatconnector.o: ../../pikotools/textstream/types.h flatexpression.h
 flatconnector.o: baseexpression.h morm_types.h modelenv.h modeldata.h
@@ -66,8 +71,8 @@ flatexpression.o: flatexpression.h baseexpression.h
 flatexpression.o: ../../pikotools/textstream/textstream.h
 flatexpression.o: ../../pikotools/space/space.h
 flatexpression.o: ../../pikotools/textstream/types.h
-flatexpression.o: ../../pikotools/date/date.h
 flatexpression.o: ../../pikotools/convert/inttostr.h
+flatexpression.o: ../../pikotools/date/date.h
 flatexpression.o: ../../pikotools/membuffer/membuffer.h
 flatexpression.o: ../../pikotools/textstream/types.h morm_types.h modelenv.h
 flatexpression.o: modeldata.h cursorhelper.h queryresult.h
@@ -77,8 +82,8 @@ jsonconnector.o: jsonconnector.h flatconnector.h
 jsonconnector.o: ../../pikotools/textstream/textstream.h
 jsonconnector.o: ../../pikotools/space/space.h
 jsonconnector.o: ../../pikotools/textstream/types.h
-jsonconnector.o: ../../pikotools/date/date.h
 jsonconnector.o: ../../pikotools/convert/inttostr.h
+jsonconnector.o: ../../pikotools/date/date.h
 jsonconnector.o: ../../pikotools/membuffer/membuffer.h
 jsonconnector.o: ../../pikotools/textstream/types.h jsonexpression.h
 jsonconnector.o: flatexpression.h baseexpression.h morm_types.h modelenv.h
@@ -89,8 +94,8 @@ jsonexpression.o: jsonexpression.h flatexpression.h baseexpression.h
 jsonexpression.o: ../../pikotools/textstream/textstream.h
 jsonexpression.o: ../../pikotools/space/space.h
 jsonexpression.o: ../../pikotools/textstream/types.h
-jsonexpression.o: ../../pikotools/date/date.h
 jsonexpression.o: ../../pikotools/convert/inttostr.h
+jsonexpression.o: ../../pikotools/date/date.h
 jsonexpression.o: ../../pikotools/membuffer/membuffer.h
 jsonexpression.o: ../../pikotools/textstream/types.h morm_types.h modelenv.h
 jsonexpression.o: modeldata.h cursorhelper.h queryresult.h
@@ -98,7 +103,7 @@ jsonexpression.o: ../../pikotools/log/log.h ../../pikotools/log/filelog.h
 jsonexpression.o: finderhelper.h fieldvaluehelper.h ft.h
 model.o: model.h ../../pikotools/textstream/textstream.h
 model.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
-model.o: ../../pikotools/date/date.h ../../pikotools/convert/inttostr.h
+model.o: ../../pikotools/convert/inttostr.h ../../pikotools/date/date.h
 model.o: ../../pikotools/membuffer/membuffer.h
 model.o: ../../pikotools/textstream/types.h modelconnector.h clearer.h
 model.o: dbconnector.h ../../pikotools/log/log.h
@@ -119,13 +124,15 @@ postgresqlconnector.o: postgresqlconnector.h dbconnector.h
 postgresqlconnector.o: ../../pikotools/textstream/textstream.h
 postgresqlconnector.o: ../../pikotools/space/space.h
 postgresqlconnector.o: ../../pikotools/textstream/types.h
-postgresqlconnector.o: ../../pikotools/date/date.h
 postgresqlconnector.o: ../../pikotools/convert/inttostr.h
+postgresqlconnector.o: ../../pikotools/date/date.h
 postgresqlconnector.o: ../../pikotools/membuffer/membuffer.h
 postgresqlconnector.o: ../../pikotools/textstream/types.h
 postgresqlconnector.o: ../../pikotools/log/log.h
 postgresqlconnector.o: ../../pikotools/log/filelog.h queryresult.h
 postgresqlconnector.o: postgresqlqueryresult.h ../../pikotools/utf8/utf8.h
+postgresqlconnector.o: ../../pikotools/utf8/utf8_templates.h
+postgresqlconnector.o: ../../pikotools/utf8/utf8_private.h
 postgresqlconnector.o: postgresqlexpression.h dbexpression.h baseexpression.h
 postgresqlconnector.o: morm_types.h modelenv.h modeldata.h cursorhelper.h
 postgresqlconnector.o: finderhelper.h fieldvaluehelper.h ft.h
@@ -137,8 +144,8 @@ postgresqlexpression.o: baseexpression.h
 postgresqlexpression.o: ../../pikotools/textstream/textstream.h
 postgresqlexpression.o: ../../pikotools/space/space.h
 postgresqlexpression.o: ../../pikotools/textstream/types.h
-postgresqlexpression.o: ../../pikotools/date/date.h
 postgresqlexpression.o: ../../pikotools/convert/inttostr.h
+postgresqlexpression.o: ../../pikotools/date/date.h
 postgresqlexpression.o: ../../pikotools/membuffer/membuffer.h
 postgresqlexpression.o: ../../pikotools/textstream/types.h morm_types.h
 postgresqlexpression.o: modelenv.h modeldata.h cursorhelper.h queryresult.h
@@ -150,16 +157,18 @@ postgresqlqueryresult.o: ../../pikotools/log/log.h
 postgresqlqueryresult.o: ../../pikotools/textstream/textstream.h
 postgresqlqueryresult.o: ../../pikotools/space/space.h
 postgresqlqueryresult.o: ../../pikotools/textstream/types.h
-postgresqlqueryresult.o: ../../pikotools/date/date.h
 postgresqlqueryresult.o: ../../pikotools/convert/inttostr.h
+postgresqlqueryresult.o: ../../pikotools/date/date.h
 postgresqlqueryresult.o: ../../pikotools/membuffer/membuffer.h
 postgresqlqueryresult.o: ../../pikotools/textstream/types.h
 postgresqlqueryresult.o: ../../pikotools/log/filelog.h
 queryresult.o: queryresult.h ../../pikotools/log/log.h
 queryresult.o: ../../pikotools/textstream/textstream.h
 queryresult.o: ../../pikotools/space/space.h
-queryresult.o: ../../pikotools/textstream/types.h ../../pikotools/date/date.h
-queryresult.o: ../../pikotools/convert/inttostr.h
+queryresult.o: ../../pikotools/textstream/types.h
+queryresult.o: ../../pikotools/convert/inttostr.h ../../pikotools/date/date.h
 queryresult.o: ../../pikotools/membuffer/membuffer.h
 queryresult.o: ../../pikotools/textstream/types.h
 queryresult.o: ../../pikotools/log/filelog.h ../../pikotools/utf8/utf8.h
+queryresult.o: ../../pikotools/utf8/utf8_templates.h
+queryresult.o: ../../pikotools/utf8/utf8_private.h