diff --git a/ZA2X/PROG/ZDEMO_EXCEL33.slnk b/ZA2X/PROG/ZDEMO_EXCEL33.slnk
index 712c1b4..62ab0af 100644
--- a/ZA2X/PROG/ZDEMO_EXCEL33.slnk
+++ b/ZA2X/PROG/ZDEMO_EXCEL33.slnk
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-2"?>
-<PROG NAME="ZDEMO_EXCEL33" VARCL="X" SUBC="1" CNAM="RTURNHEIM" CDAT="20120311" UNAM="K2_SCHMOECK" UDAT="20120324" VERN="000028" RSTAT="T" RMAND="001" RLOAD="E" FIXPT="X" SDATE="20120324" STIME="111822" IDATE="20120324" ITIME="111822" UCCHECK="X">
+<?xml version="1.0" encoding="utf-8"?>
+<PROG NAME="ZDEMO_EXCEL33" VARCL="X" SUBC="1" RSTAT="T" RMAND="001" RLOAD="E" FIXPT="X" UCCHECK="X">
  <textPool>
   <language SPRAS="E">
    <textElement ID="R" ENTRY="abap2xlsx Demo: Autofilter" LENGTH="27 "/>
@@ -24,21 +24,10 @@ DATA: lo_excel                TYPE REF TO zcl_excel,
       lo_converter            TYPE REF TO zcl_excel_converter,
       lo_autofilter           TYPE REF TO zcl_excel_autofilter.
 
-DATA lt_test TYPE TABLE OF sflight.
+DATA lt_test TYPE TABLE OF t005t.
 
-DATA: lv_title TYPE zexcel_sheet_title,
-      lt_carr  TYPE TABLE OF scarr,
-      row TYPE zexcel_cell_row VALUE 2,
-      lt_dfies TYPE STANDARD TABLE OF dfies,
-      ls_dfies TYPE dfies,
-      l_row_int TYPE i,
-      l_col_int TYPE i,
-      l_col_alpha TYPE zexcel_cell_column_alpha,
-      l_cell_value TYPE zexcel_cell_value,
+DATA: l_cell_value TYPE zexcel_cell_value,
       ls_area      TYPE zexcel_s_autofilter_area.
-DATA: lo_data_validation  TYPE REF TO zcl_excel_data_validation.
-FIELD-SYMBOLS: &lt;fs_test&gt; TYPE sflight,
-               &lt;fs_fldval&gt; TYPE ANY.
 
 CONSTANTS: c_airlines TYPE string VALUE &apos;Airlines&apos;.
 
@@ -55,31 +44,30 @@ START-OF-SELECTION.
   lo_worksheet = lo_excel-&gt;get_active_worksheet( ).
   lo_worksheet-&gt;set_title( ip_title = &apos;Internal table&apos;).
 
-  SELECT * UP TO 500 ROWS FROM sflight INTO TABLE lt_test. &quot;#EC CI_NOWHERE
+  SELECT * UP TO 2 ROWS FROM t005t INTO TABLE lt_test.  &quot;#EC CI_NOWHERE
 
   CREATE OBJECT lo_converter.
 
   lo_converter-&gt;convert( EXPORTING
                             it_table     = lt_test
-                            i_row_int    = 3
-                            i_column_int = 2
+                            i_row_int    = 1
+                            i_column_int = 1
                             io_worksheet = lo_worksheet
                          CHANGING
                             co_excel     = lo_excel ) .
 
   lo_autofilter = lo_excel-&gt;add_new_autofilter( io_sheet = lo_worksheet ) .
 
-  ls_area-row_start = 3.
-  ls_area-col_start = 3.
-  DESCRIBE TABLE lt_test LINES l_row_int.
-  ls_area-row_end = l_row_int + 3.
-  ls_area-col_end = 3.
+  ls_area-row_start = 1.
+  ls_area-col_start = 1.
+  ls_area-row_end = lo_worksheet-&gt;get_highest_row( ).
+  ls_area-col_end = lo_worksheet-&gt;get_highest_column( ).
 
   lo_autofilter-&gt;set_filter_area( is_area = ls_area ).
 
   lo_worksheet-&gt;get_cell( EXPORTING
                              ip_column    = &apos;C&apos;
-                             ip_row       = 5
+                             ip_row       = 2
                           IMPORTING
                              ep_value     = l_cell_value ).
   lo_autofilter-&gt;set_value( i_column = 3