diff --git a/abaplint.json b/abaplint.json
index 297ef48c4..198b83caf 100644
--- a/abaplint.json
+++ b/abaplint.json
@@ -448,12 +448,12 @@
     },
     "slow_parameter_passing": true,
     "double_space": true,
+    "select_single_full_key": true,
     "whitespace_end": true
   },
   "targetRules": {
     "select_add_order_by": {
       "skipForAllEntries": true
-    },
-    "select_single_full_key": true
+    }
   }
 }
diff --git a/src/objects/zcl_abapgit_object_doct.clas.abap b/src/objects/zcl_abapgit_object_doct.clas.abap
index b40fe39f2..153e4a5bc 100644
--- a/src/objects/zcl_abapgit_object_doct.clas.abap
+++ b/src/objects/zcl_abapgit_object_doct.clas.abap
@@ -82,7 +82,7 @@ CLASS zcl_abapgit_object_doct IMPLEMENTATION.
 
     SELECT SINGLE id FROM dokil INTO lv_id
       WHERE id         = c_id
-        AND object     = lv_object.                     "#EC CI_GENBUFF
+        AND object     = lv_object.     "#EC CI_GENBUFF "#EC CI_NOORDER
 
     rv_bool = boolc( sy-subrc = 0 ).
 
diff --git a/src/objects/zcl_abapgit_object_docv.clas.abap b/src/objects/zcl_abapgit_object_docv.clas.abap
index 289b899f7..5ec6c4004 100644
--- a/src/objects/zcl_abapgit_object_docv.clas.abap
+++ b/src/objects/zcl_abapgit_object_docv.clas.abap
@@ -146,8 +146,8 @@ CLASS zcl_abapgit_object_docv IMPLEMENTATION.
   METHOD zif_abapgit_object~exists.
 
     SELECT SINGLE id FROM dokil INTO mv_id
-      WHERE id     = mv_id
-        AND object = mv_doc_object.                     "#EC CI_GENBUFF
+       WHERE id     = mv_id
+         AND object = mv_doc_object.    "#EC CI_GENBUFF "#EC CI_NOORDER
 
     rv_bool = boolc( sy-subrc = 0 ).
 
diff --git a/src/objects/zcl_abapgit_object_dsys.clas.abap b/src/objects/zcl_abapgit_object_dsys.clas.abap
index 0b99a8701..491ce9adb 100644
--- a/src/objects/zcl_abapgit_object_dsys.clas.abap
+++ b/src/objects/zcl_abapgit_object_dsys.clas.abap
@@ -106,7 +106,7 @@ CLASS zcl_abapgit_object_dsys IMPLEMENTATION.
     SELECT SINGLE langu FROM dokil INTO rv_language
       WHERE id = c_id
       AND object = mv_doc_object
-      AND masterlang = abap_true.
+      AND masterlang = abap_true.                       "#EC CI_NOORDER
 
     IF sy-subrc <> 0.
       rv_language = mv_language.
@@ -171,7 +171,7 @@ CLASS zcl_abapgit_object_dsys IMPLEMENTATION.
 
     SELECT SINGLE COUNT( * ) FROM dokil INTO lv_count
            WHERE id   = c_id
-           AND object = mv_doc_object.                  "#EC CI_GENBUFF
+           AND object = mv_doc_object.  "#EC CI_GENBUFF "#EC CI_NOORDER
 
     rv_bool = boolc( lv_count > 0 ).
 
diff --git a/src/objects/zcl_abapgit_object_sots.clas.abap b/src/objects/zcl_abapgit_object_sots.clas.abap
index e5746687c..06cf10cfb 100644
--- a/src/objects/zcl_abapgit_object_sots.clas.abap
+++ b/src/objects/zcl_abapgit_object_sots.clas.abap
@@ -194,7 +194,7 @@ CLASS zcl_abapgit_object_sots IMPLEMENTATION.
 
   METHOD zif_abapgit_object~changed_by.
     SELECT SINGLE chan_name FROM sotr_headu INTO rv_user
-      WHERE paket = ms_item-obj_name.
+      WHERE paket = ms_item-obj_name.                   "#EC CI_NOORDER
     IF sy-subrc <> 0.
       rv_user = c_user_unknown.
     ENDIF.
diff --git a/src/objects/zcl_abapgit_object_suso.clas.abap b/src/objects/zcl_abapgit_object_suso.clas.abap
index ae8b2b511..c9065bf25 100644
--- a/src/objects/zcl_abapgit_object_suso.clas.abap
+++ b/src/objects/zcl_abapgit_object_suso.clas.abap
@@ -54,7 +54,7 @@ CLASS zcl_abapgit_object_suso IMPLEMENTATION.
     SELECT SINGLE langu
            FROM dokil INTO lv_dummy
            WHERE id   = 'UO'                            "#EC CI_GENBUFF
-           AND object = lv_docu_obj.
+           AND object = lv_docu_obj.                    "#EC CI_NOORDER
 
     IF sy-subrc = 0.
 
@@ -278,6 +278,7 @@ CLASS zcl_abapgit_object_suso IMPLEMENTATION.
 
     SELECT SINGLE objct FROM tobj INTO lv_objct
       WHERE objct = ms_item-obj_name.
+
     rv_bool = boolc( sy-subrc = 0 ).
 
   ENDMETHOD.
diff --git a/src/objects/zcl_abapgit_object_tabl.clas.abap b/src/objects/zcl_abapgit_object_tabl.clas.abap
index 51b841658..b5f33aa78 100644
--- a/src/objects/zcl_abapgit_object_tabl.clas.abap
+++ b/src/objects/zcl_abapgit_object_tabl.clas.abap
@@ -925,7 +925,7 @@ CLASS zcl_abapgit_object_tabl IMPLEMENTATION.
     IF sy-subrc <> 0.
       " Check for new, inactive, or modified versions that might not be in nametab
       SELECT SINGLE tabname FROM dd02l INTO lv_tabname
-        WHERE tabname = lv_tabname.
+        WHERE tabname = lv_tabname.                     "#EC CI_NOORDER
     ENDIF.
     rv_bool = boolc( sy-subrc = 0 ).
 
diff --git a/src/objects/zcl_abapgit_object_type.clas.abap b/src/objects/zcl_abapgit_object_type.clas.abap
index 64608e92f..02e44039f 100644
--- a/src/objects/zcl_abapgit_object_type.clas.abap
+++ b/src/objects/zcl_abapgit_object_type.clas.abap
@@ -161,7 +161,7 @@ CLASS zcl_abapgit_object_type IMPLEMENTATION.
     SELECT SINGLE state
       FROM progdir
       INTO lv_state
-      WHERE name = lv_progname.
+      WHERE name = lv_progname.                         "#EC CI_NOORDER
     IF lv_state IS NOT INITIAL.
       rv_bool = abap_true.
     ENDIF.
diff --git a/src/persist/zcl_abapgit_persist_migrate.clas.abap b/src/persist/zcl_abapgit_persist_migrate.clas.abap
index 77b671a54..77ef0989d 100644
--- a/src/persist/zcl_abapgit_persist_migrate.clas.abap
+++ b/src/persist/zcl_abapgit_persist_migrate.clas.abap
@@ -314,7 +314,7 @@ CLASS zcl_abapgit_persist_migrate IMPLEMENTATION.
     DATA: lv_tabname TYPE dd02l-tabname.
 
     SELECT SINGLE tabname FROM dd02l INTO lv_tabname
-      WHERE tabname = zcl_abapgit_persistence_db=>c_tabname.
+      WHERE tabname = zcl_abapgit_persistence_db=>c_tabname. "#EC CI_NOORDER
     rv_exists = boolc( sy-subrc = 0 ).
 
   ENDMETHOD.