diff --git a/APPL/API2/api2.inc b/APPL/API2/api2.inc
index 8c38971911..03b441eddc 100644
--- a/APPL/API2/api2.inc
+++ b/APPL/API2/api2.inc
@@ -412,7 +412,6 @@ api2 = {
                             }
                             break;
                         case "number":
-                        case "integer":
                             var safe_val = parseInt(filterval, 10);
                             if (filter == "range")
                             {
diff --git a/APPL/API2/model_reportcolumns.inc b/APPL/API2/model_reportcolumns.inc
index 2ca85b15b1..93124f5d2c 100644
--- a/APPL/API2/model_reportcolumns.inc
+++ b/APPL/API2/model_reportcolumns.inc
@@ -28,7 +28,7 @@ model_reportcolumns =
               "name"      : { dbs: "fac_usrrap_cols_column_name", typ: "varchar", label: L("lcl_rap_column"), insertonly: true },
               "datatype"  : { dbs: "fac_usrrap_cols_datatype",    typ: "varchar", label: L("lcl_rap_datatype"),
                                 required: true,
-                                LOV: L("lcl_rap_datatypeLOV")}, // "varchar;Tekst;date;Datum;datetime;Datumtijd;float;Float;currency;Bedrag;integer;Getal"
+                                LOV: L("lcl_rap_datatypeLOV")}, // "varchar;Tekst;date;Datum;datetime;Datumtijd;float;Float;currency;Bedrag;number;Getal"
               "sequence"  : { dbs: "fac_usrrap_cols_volgnr",      typ: "number",  label: L("lcl_rap_sequence") },
               "caption"   : { dbs: "fac_usrrap_cols_caption",     typ: "varchar", label: L("lcl_rap_caption")},
               "filter"    : { dbs: "fac_usrrap_cols_filter",      typ: "varchar", label: L("lcl_rap_filter"),
@@ -61,10 +61,9 @@ model_reportcolumns =
                 break;
             case "float":
             case "number":
-            case "integer":
             case "currency":
                 model_reportcolumns.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G,S,C,A");
-                model_reportcolumns.fields.datatype.LOV = api2.filterLOV(L("lcl_rap_datatypeLOV"), "float,currency,integer");
+                model_reportcolumns.fields.datatype.LOV = api2.filterLOV(L("lcl_rap_datatypeLOV"), "float,currency,number");
                 break;
             default:
                 model_reportcolumns.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G");
diff --git a/APPL/API2/model_reports.inc b/APPL/API2/model_reports.inc
index 75347c7ddf..b65036f91a 100644
--- a/APPL/API2/model_reports.inc
+++ b/APPL/API2/model_reports.inc
@@ -173,7 +173,7 @@ function model_reports(fac_usrrap_key)
                       group: usrrap.columns[i].group,              // bij een beheerder maar rapportages wordt misschien wel fe
                       visible: usrrap.columns[i].visible.id
                     };
-        if (field.typ == "integer" && field.dbs.match(/_key$/i)) // Vooral de FCLT_3D filters
+        if (field.typ == "number" && field.dbs.match(/_key$/i)) // Vooral de FCLT_3D filters
             field.typ = "key";
 
         if (usrrap.columns[i].filter)
@@ -191,7 +191,7 @@ function model_reports(fac_usrrap_key)
                 field.filter = api2.splitLOV("E;exact;L;like;R;range")[usrrap.columns[i].filter.id]
             }
         }
-        var fld = field.dbs.toLowerCase();  // "C" + String(usrrap.columns[i].id)
+        var fld = field.dbs.toLowerCase();
         model.fields[fld] = field;
         if (usrrap.columns[i].visible.id == 'V')
             model.list.columns.push(fld);
diff --git a/APPL/FAC/fac_usrrap.inc b/APPL/FAC/fac_usrrap.inc
index 00060c7ca2..e91a4a31ff 100644
--- a/APPL/FAC/fac_usrrap.inc
+++ b/APPL/FAC/fac_usrrap.inc
@@ -292,7 +292,7 @@ usrrap = {
                 }
                 else if (ora_type == 'NUMBER')
                 {
-                   colpar.datatype = 'integer';
+                   colpar.datatype = 'number';
                    if (ora_scale > 0)
                    {
                        colpar.datatype = 'float';
diff --git a/APPL/SCF/scaffolding_list.inc b/APPL/SCF/scaffolding_list.inc
index eca4d32c27..0c31eb9ece 100644
--- a/APPL/SCF/scaffolding_list.inc
+++ b/APPL/SCF/scaffolding_list.inc
@@ -134,6 +134,9 @@ function scaffolding_list(model, scf_params)
                 continue; // Dat voegt dan weinig toe
 
             var coldata = { caption: field.label, content: fld, datatype: field.typ, total: field.total };
+            if (coldata.datatype == 'number' || coldata.datatype == 'key')
+                coldata.datatype = 'integer'; // Zo verwacht resultsettable dat (/nog)
+
             if (field.typ == 'check' || field.typ == 'check0')
             {
                coldata.content = fnfncolCheck(fld);