diff --git a/src/zabapgit_background.prog.abap b/src/zabapgit_background.prog.abap
index 01d643c7c..21fce22bf 100644
--- a/src/zabapgit_background.prog.abap
+++ b/src/zabapgit_background.prog.abap
@@ -97,6 +97,9 @@ CLASS lcl_background IMPLEMENTATION.
       APPEND lv_str TO lt_objects.
     ENDLOOP.
 
+    SORT lt_objects AS TEXT.
+    DELETE ADJACENT DUPLICATES FROM lt_objects.
+
     IF lines( lt_objects ) = 1.
       rv_comment = |BG: { lv_str }|.
     ELSE.
diff --git a/src/zabapgit_html_action_utils.prog.abap b/src/zabapgit_html_action_utils.prog.abap
index 8fd1ed7bb..df57ea389 100644
--- a/src/zabapgit_html_action_utils.prog.abap
+++ b/src/zabapgit_html_action_utils.prog.abap
@@ -271,8 +271,8 @@ CLASS lcl_html_action_utils IMPLEMENTATION.
     get_field( EXPORTING name = 'XMLDATA' it = lt_fields CHANGING cv = rs_content-data_str ).
     IF rs_content-data_str(1) <> '<' AND rs_content-data_str+1(1) = '<'. " Hmmm ???
       rs_content-data_str = rs_content-data_str+1.
-    ELSE.
-      CLEAR rs_content-data_str.
+*    ELSE.
+*      CLEAR rs_content-data_str.
     ENDIF.
 
   ENDMETHOD.                    "dbcontent_decode
diff --git a/src/zabapgit_object_susc.prog.abap b/src/zabapgit_object_susc.prog.abap
index 5830bc7b4..615cb27a6 100644
--- a/src/zabapgit_object_susc.prog.abap
+++ b/src/zabapgit_object_susc.prog.abap
@@ -61,9 +61,9 @@ CLASS lcl_object_susc IMPLEMENTATION.
     SELECT SINGLE * FROM tobct INTO ls_tobct
       WHERE oclss = ms_item-obj_name
       AND langu = mv_language.
-    IF sy-subrc <> 0.
-      lcx_exception=>raise( 'TOBCT no english description' ).
-    ENDIF.
+*    IF sy-subrc <> 0.
+*     lcx_exception=>raise( 'TOBCT no english description' ).
+*    ENDIF.
 
     io_xml->add( iv_name = 'TOBC'
                  ig_data = ls_tobc ).
diff --git a/src/zabapgit_view_repo.prog.abap b/src/zabapgit_view_repo.prog.abap
index 3de6e6655..5c9cd9b74 100644
--- a/src/zabapgit_view_repo.prog.abap
+++ b/src/zabapgit_view_repo.prog.abap
@@ -110,6 +110,7 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
           lx_error      TYPE REF TO lcx_exception,
           lv_lstate     TYPE char1,
           lv_rstate     TYPE char1,
+          lv_max        TYPE abap_bool,
           lo_log        TYPE REF TO lcl_log.
 
     FIELD-SYMBOLS <ls_item> LIKE LINE OF lt_repo_items.
@@ -159,11 +160,20 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
           ro_html->add( render_empty_package( ) ).
         ELSE.
           LOOP AT lt_repo_items ASSIGNING <ls_item>.
+            IF sy-tabix > 500.
+              lv_max = abap_true.
+              EXIT. " current loop
+            ENDIF.
             ro_html->add( render_item( <ls_item> ) ).
           ENDLOOP.
         ENDIF.
 
         ro_html->add( '</table>' ).
+
+        IF lv_max = abap_true.
+          ro_html->add( 'Only first 500 objects shown in list' ).
+        ENDIF.
+
         ro_html->add( '</div>' ).
 
       CATCH lcx_exception INTO lx_error.