diff --git a/hayamiki_lib b/hayamiki_lib
index 2993d53..8bf8743 160000
--- a/hayamiki_lib
+++ b/hayamiki_lib
@@ -1 +1 @@
-Subproject commit 2993d53f11c4415314ab44c8ff3ad2bf671ad812
+Subproject commit 8bf8743ef98b0fada8bc776abbda3d7bff3933c3
diff --git a/src/generation/choices_selector.anubis b/src/generation/choices_selector.anubis
index 8918873..7441495 100644
--- a/src/generation/choices_selector.anubis
+++ b/src/generation/choices_selector.anubis
@@ -29,7 +29,8 @@ define Maybe(One)
     "  get_choices_selector_"+table_name+"_"+column_name+"\n"+
     "  (\n"+
     "    SQLite3DataBase  db,\n"+
-    "    String           clause\n"+
+    "    HK_Referer       referer,  //Not used, only there for compatibility\n"+
+    "    String           filter    //Not used, only there for compatibility\n"+
     "  )=\n"+
     "  [\n"+
     concat(map((HK_Text_Choice hk_txt_choice) |-> 
diff --git a/src/generation/edit_view_table_form.anubis b/src/generation/edit_view_table_form.anubis
index af36ca0..5b46f6c 100644
--- a/src/generation/edit_view_table_form.anubis
+++ b/src/generation/edit_view_table_form.anubis
@@ -41,8 +41,9 @@ public define String
             success(form_string)  then  "hk_form_table_cell("+form_string+")"
           }
       }
-    label(label_str)  then  "hk_form_table_cell(label(\""+label_str+"\"))"
-    table(lines)      then  
+    column_label(col_name)  then  "hk_form_table_cell(label(\""+to_upper(col_name)+"\")",
+    label(label_str)        then  "hk_form_table_cell(label(\""+label_str+"\"))"
+    table(lines)            then  
       "hk_form_table_cell_table(["+
         make_lines(lines, columns, type_name, indent+"  ")+
       "\n"+indent+"])"
--
libgit2 0.21.4