diff --git a/src/00/z2ui5_cl_app_demo_00.clas.abap b/src/00/z2ui5_cl_app_demo_00.clas.abap
index 45c4212a..09ec2917 100644
--- a/src/00/z2ui5_cl_app_demo_00.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_00.clas.abap
@@ -68,12 +68,13 @@ CLASS Z2UI5_CL_APP_DEMO_00 IMPLEMENTATION.
         )->button( text = 'F4-Value-Help'   press = client->_event( 'Z2UI5_CL_APP_DEMO_09' ) ).
 
     grid->simple_form( title = 'HowTo - Tables I' layout = 'ResponsiveGridLayout' )->content( 'form'
-        )->button( text = 'List'                        press = client->_event( 'z2ui5_cl_app_demo_03' )
-        )->button( text = 'Toolbar, Container, Sort'   press = client->_event( 'z2ui5_cl_app_demo_06' )
-        )->button( text = 'Selection Modes'             press = client->_event( 'z2ui5_cl_app_demo_19' )
+        )->button( text = 'List I'                    press = client->_event( 'z2ui5_cl_app_demo_03' )
+        )->button( text = 'List II'                   press = client->_event( 'z2ui5_cl_app_demo_48' )
+        )->button( text = 'Toolbar, Container, Sort'  press = client->_event( 'z2ui5_cl_app_demo_06' )
     ).
 
    grid->simple_form( title = 'HowTo - Tables II' layout = 'ResponsiveGridLayout' )->content( 'form'
+        )->button( text = 'Selection Modes'           press = client->_event( 'z2ui5_cl_app_demo_19' )
         )->button( text = 'Editable' press = client->_event( 'z2ui5_cl_app_demo_11' )
         )->button( text = 'Filter'   press = client->_event( 'z2ui5_cl_app_demo_45' )
     ).
diff --git a/src/00/z2ui5_cl_app_demo_35.clas.abap b/src/00/z2ui5_cl_app_demo_35.clas.abap
index ac837047..b056c0e6 100644
--- a/src/00/z2ui5_cl_app_demo_35.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_35.clas.abap
@@ -5,7 +5,9 @@ CLASS z2ui5_cl_app_demo_35 DEFINITION PUBLIC.
     INTERFACES z2ui5_if_app.
 
     DATA mt_table TYPE REF TO data.
+    DATA mt_cols TYPE string_table.
     DATA mv_name TYPE string.
+    DATA mv_input TYPE string.
 
   PROTECTED SECTION.
 
@@ -60,10 +62,17 @@ CLASS z2ui5_cl_app_demo_35 IMPLEMENTATION.
 
     CASE app-get-event.
 
+      WHEN 'BUTTON_TABLE'.
+        FIELD-SYMBOLS <tab> TYPE STANDARD TABLE.
+        CREATE DATA mt_table TYPE STANDARD TABLE OF (mv_name).
+        ASSIGN mt_table->* TO <tab>.
+        mt_cols = lcl_db=>get_fieldlist_by_table( <tab> ).
+
+
       WHEN 'BUTTON_POST'.
 
         CREATE DATA mt_table TYPE STANDARD TABLE OF (mv_name).
-        FIELD-SYMBOLS <tab> TYPE table.
+        "FIELD-SYMBOLS <tab> TYPE table.
         ASSIGN mt_table->* TO <tab>.
 
         SELECT FROM (mv_name)
@@ -114,6 +123,18 @@ CLASS z2ui5_cl_app_demo_35 IMPLEMENTATION.
 
     lo_view->input( client->_bind( mv_name  ) ).
 
+    lo_view->button(
+                text  = 'search'
+                press = client->_event( 'BUTTON_TABLE' )
+            ).
+  lo_view = lo_view->get_parent( )->get_parent( )->simple_form( title = 'cols' editable = abap_true
+                )->content( 'form' ).
+
+    LOOP AT mt_cols REFERENCE INTO DATA(lr_col).
+      lo_view->label( lr_col->* ).
+      lo_view->input( value = mv_input ).
+    ENDLOOP.
+
     lo_view->button(
                 text  = 'search'
                 press = client->_event( 'BUTTON_POST' )
@@ -128,15 +149,15 @@ CLASS z2ui5_cl_app_demo_35 IMPLEMENTATION.
                   items = client->_bind( val = <tab>  check_gen_data = abap_true )
               ).
 
-      DATA(lt_fields) = lcl_db=>get_fieldlist_by_table( <tab> ).
+      " DATA(lt_fields) = lcl_db=>get_fieldlist_by_table( <tab> ).
 
       DATA(lo_columns) = tab->columns( ).
-      LOOP AT lt_fields INTO DATA(lv_field) FROM 2.
+      LOOP AT mt_cols INTO DATA(lv_field) FROM 2.
         lo_columns->column( )->text( lv_field ).
       ENDLOOP.
 
       DATA(lo_cells) = tab->items( )->column_list_item( selected = '{SELKZ}' )->cells( ).
-      LOOP AT lt_fields INTO lv_field FROM 2.
+      LOOP AT mt_cols INTO lv_field FROM 2.
         lo_cells->input( `{` && lv_field && `}` ).
       ENDLOOP.
 
diff --git a/src/00/z2ui5_cl_app_demo_44.clas.abap b/src/00/z2ui5_cl_app_demo_44.clas.abap
index 5deb7eae..2acf1f4b 100644
--- a/src/00/z2ui5_cl_app_demo_44.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_44.clas.abap
@@ -1,20 +1,14 @@
 CLASS z2ui5_cl_app_demo_44 DEFINITION PUBLIC.
 
   PUBLIC SECTION.
-
     INTERFACES z2ui5_if_app.
-    INTERFACES if_oo_adt_classrun.
 
 ENDCLASS.
 
-CLASS Z2UI5_CL_APP_DEMO_44 IMPLEMENTATION.
-
-  METHOD if_oo_adt_classrun~main.
-    out->write( `Hello World` ).
-  ENDMETHOD.
+CLASS z2ui5_cl_app_demo_44 IMPLEMENTATION.
 
   METHOD z2ui5_if_app~main.
-    client->set_next( VALUE #( xml_main = z2ui5_cl_xml_view=>factory( )->label( 'Hello World!' )->get_root( )->xml_get( ) ) ).
+    client->set_next( VALUE #( xml_main = z2ui5_cl_xml_view=>factory( )->label( `Hello World!` )->get_root( )->xml_get( ) ) ).
   ENDMETHOD.
 
 ENDCLASS.
diff --git a/src/00/z2ui5_cl_app_demo_48.clas.abap b/src/00/z2ui5_cl_app_demo_48.clas.abap
index 53b5101b..82c12735 100644
--- a/src/00/z2ui5_cl_app_demo_48.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_48.clas.abap
@@ -50,13 +50,10 @@ CLASS z2ui5_cl_app_demo_48 IMPLEMENTATION.
       WHEN 'TEST'.
         data(lv_row_title) = client->get( )-event_data.
         client->popup_message_box( `event: test - ` && lv_row_title ).
-
       WHEN 'SELCHANGE'.
         DATA(lt_sel) = t_tab.
         DELETE lt_sel WHERE selected = abap_false.
         client->popup_message_box( `event: selection change -` && lt_sel[ 1 ]-title ).
-
-
       WHEN 'BACK'.
         client->nav_app_leave( client->get_app( client->get( )-id_prev_app_stack ) ).
     ENDCASE.
diff --git a/src/00/z2ui5_cl_app_demo_48.clas.xml b/src/00/z2ui5_cl_app_demo_48.clas.xml
index 4e0a8842..c8d30641 100644
--- a/src/00/z2ui5_cl_app_demo_48.clas.xml
+++ b/src/00/z2ui5_cl_app_demo_48.clas.xml
@@ -5,7 +5,7 @@
    <VSEOCLASS>
     <CLSNAME>Z2UI5_CL_APP_DEMO_48</CLSNAME>
     <LANGU>E</LANGU>
-    <DESCRIPT>tab - list test</DESCRIPT>
+    <DESCRIPT>tab - list2</DESCRIPT>
     <STATE>1</STATE>
     <CLSCCINCL>X</CLSCCINCL>
     <FIXPT>X</FIXPT>