diff --git a/src/z2ui5_cl_http_handler.clas.locals_imp.abap b/src/z2ui5_cl_http_handler.clas.locals_imp.abap
index ca4de0f8..c55c0bfa 100644
--- a/src/z2ui5_cl_http_handler.clas.locals_imp.abap
+++ b/src/z2ui5_cl_http_handler.clas.locals_imp.abap
@@ -763,9 +763,11 @@ CLASS z2ui5_lcl_utility_tree_json IMPLEMENTATION.
     result = NEW #( ).
     result->mo_root = result.
 
+
     /ui2/cl_json=>deserialize( EXPORTING json         = CONV string( iv_json )
                                          assoc_arrays = abap_true
                                CHANGING  data         = result->mr_actual ).
+
   ENDMETHOD.
 
   METHOD new.
diff --git a/src/z2ui5_cl_xml_view.clas.abap b/src/z2ui5_cl_xml_view.clas.abap
index 6c91914c..8e731367 100644
--- a/src/z2ui5_cl_xml_view.clas.abap
+++ b/src/z2ui5_cl_xml_view.clas.abap
@@ -1299,43 +1299,6 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
     result = _generic( name = `Bar` ).
   ENDMETHOD.
 
-
-  METHOD icontabbar.
-
-        result = _generic( name   = `IconTabBar`
-                       t_prop = VALUE #( ( n = `class`       v = class )
-                                         ( n = `select`      v = select )
-                                         ( n = `expand`      v = expand )
-                                         ( n = `expandable`  v = expandable )
-                                         ( n = `expanded`    v = expanded )
-                                         ( n = `selectedKey` v = selectedKey ) ) ).
-  ENDMETHOD.
-
-
-  METHOD icontabfilter.
-
-        result = _generic( name   = `IconTabFilter`
-                       t_prop = VALUE #( ( n = `icon`        v = icon )
-                                         ( n = `iconColor`   v = iconColor )
-                                         ( n = `showAll`     v = showAll )
-                                         ( n = `count`       v = count )
-                                         ( n = `text`        v = text )
-                                         ( n = `key`         v = key ) ) ).
-  ENDMETHOD.
-
-
-  METHOD ICONTABSEPARATOR.
-
-        result = _generic( name   = `IconTabSeparator` ).
-
-  ENDMETHOD.
-
-  METHOD bars.
-    result = _generic( name = `bars`
-                       ns   = `mchart` ).
-  ENDMETHOD.
-
-
   METHOD begin_column_pages.
     " todo, implement method
     result = _generic( name = `beginColumnPages`
@@ -1391,6 +1354,12 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
   ENDMETHOD.
 
 
+  METHOD bars.
+    result = _generic( name = `bars`
+                       ns   = `mchart` ).
+  ENDMETHOD.
+
+
   METHOD buttons.
     result = _generic( `buttons` ).
   ENDMETHOD.
@@ -1434,7 +1403,7 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
 
   METHOD cc_file_uploader_get_js.
 
-    DATA(js) = ` jQuery.sap.declare("z2ui5.FileUploader");` && |\n| &&
+    DATA(js) = ` debugger; jQuery.sap.declare("z2ui5.FileUploader");` && |\n| &&
                           |\n| &&
                           `        sap.ui.define([` && |\n| &&
                           `            "sap/ui/core/Control",` && |\n| &&
@@ -1502,7 +1471,7 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
                           |\n| &&
                           `                            this.setProperty("path", this.oFileUploader.getProperty("value"));` && |\n| &&
                           |\n| &&
-                          `                            var file = this.oFileUploader.oFileUpload.files[0];` && |\n| &&
+                          `                            var file = sap.z2ui5.oUpload.oFileUpload.files[0];` && |\n| &&
                           `                            var reader = new FileReader();` && |\n| &&
                           |\n| &&
                           `                            reader.onload = function (evt) {` && |\n| &&
@@ -1530,6 +1499,7 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
                           `                                this.oUploadButton.setEnabled(false);` && |\n| &&
                           `                            }` && |\n| &&
                           `                            this.oUploadButton.rerender();` && |\n| &&
+                          `                            sap.z2ui5.oUpload = oEvent.oSource;` && |\n| &&
                           `                        }.bind(oControl)` && |\n| &&
                           `                    });` && |\n| &&
                           |\n| &&
@@ -2083,6 +2053,37 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
   ENDMETHOD.
 
 
+  METHOD icontabbar.
+
+        result = _generic( name   = `IconTabBar`
+                       t_prop = VALUE #( ( n = `class`       v = class )
+                                         ( n = `select`      v = select )
+                                         ( n = `expand`      v = expand )
+                                         ( n = `expandable`  v = expandable )
+                                         ( n = `expanded`    v = expanded )
+                                         ( n = `selectedKey` v = selectedKey ) ) ).
+  ENDMETHOD.
+
+
+  METHOD icontabfilter.
+
+        result = _generic( name   = `IconTabFilter`
+                       t_prop = VALUE #( ( n = `icon`        v = icon )
+                                         ( n = `iconColor`   v = iconColor )
+                                         ( n = `showAll`     v = showAll )
+                                         ( n = `count`       v = count )
+                                         ( n = `text`        v = text )
+                                         ( n = `key`         v = key ) ) ).
+  ENDMETHOD.
+
+
+  METHOD ICONTABSEPARATOR.
+
+        result = _generic( name   = `IconTabSeparator` ).
+
+  ENDMETHOD.
+
+
   METHOD illustrated_message.
 
     result = _generic( name   = `IllustratedMessage`
@@ -2103,6 +2104,15 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
   ENDMETHOD.
 
 
+  METHOD imagecontent.
+
+    result = _generic( name   = `ImageContent`
+                   t_prop = VALUE #( ( n = `src`      v = src ) ) ).
+
+
+  ENDMETHOD.
+
+
   METHOD input.
     result = me.
     _generic( name   = `Input`
@@ -2360,6 +2370,16 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
   ENDMETHOD.
 
 
+  METHOD numericcontent.
+
+    result = _generic( name   = `NumericContent`
+                       t_prop = VALUE #( ( n = `value`      v = value )
+                                         ( n = `icon`       v = icon  )
+                                         ( n = `withMargin` v = lcl_utility=>get_json_boolean( withMargin ) ) ) ).
+
+  ENDMETHOD.
+
+
   METHOD object_attribute.
     result = me.
 
@@ -2719,7 +2739,6 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
                                 ( n = `selected`    v = selected ) ) ).
   ENDMETHOD.
 
-
   METHOD step_input.
     result = me.
     _generic( name   = `StepInput`
@@ -3124,7 +3143,6 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
 
   ENDMETHOD.
 
-
   METHOD tree.
     result = _generic( name   = `Tree`
                        t_prop = VALUE #(
@@ -3152,22 +3170,4 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
 
   ENDMETHOD.
 
-
-  METHOD numericcontent.
-
-    result = _generic( name   = `NumericContent`
-                       t_prop = VALUE #( ( n = `value`      v = value )
-                                         ( n = `icon`       v = icon  )
-                                         ( n = `withMargin` v = lcl_utility=>get_json_boolean( withMargin ) ) ) ).
-
-  ENDMETHOD.
-
-
-  METHOD imagecontent.
-
-    result = _generic( name   = `ImageContent`
-                   t_prop = VALUE #( ( n = `src`      v = src ) ) ).
-
-
-  ENDMETHOD.
-ENDCLASS.
\ No newline at end of file
+ENDCLASS.