diff --git a/APPL/MJB/mjb_search.asp b/APPL/MJB/mjb_search.asp
index 97c012d561..62be5b0f46 100644
--- a/APPL/MJB/mjb_search.asp
+++ b/APPL/MJB/mjb_search.asp
@@ -61,6 +61,7 @@ var toyear = getQParamInt("toyear", new Date().getFullYear() + S("mjb_show_years
 var incbtw = getQParamInt("incbtw", 0) == 1;
 var scen_key = getQParamInt("scenario", 1); // Scenario
 var actsit = getQParamInt("actsit", 0) == 1;
+var mjbempty = getQParamInt("mjbempty", 1) == 1;
 var ctrdisc_key = getQParamInt("ctrdisc_key", -1); // Ctrdiscipline
 
 var mjbMoved   = (getQParamInt("mjbMoved", 0) == 1);
@@ -174,7 +175,6 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
                                                                   startlevel: alg_startlevel,
                                                                   eindlevel: alg_endlevel, // ruimte/werkplek
                                                                   filtercode: "INCVR",
-                                                                  trclass: "noxd",
                                                                   whenEmpty: L("lcl_search_generic")  // want filter
                                                                 });
               //  Discipline
@@ -188,7 +188,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
                                        autfunctionKey: authparamsINSUSE.autfunctionkey,
                                        autRW: "R",
                                        onChange: "onChangeDiscipline", // disgroepChanged
-                                       trclass: "primsearch noxd",
+                                       trclass: "primsearch",
                                        whenEmpty: L("lcl_search_generic")
                                      });
               //  Soort groep
@@ -199,7 +199,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
                                      autfunction: autfunctionINSUSE,
                                      onChange: "onChangeSrtgroep",
                                      urlAdd: [{urlParam: "disc_key", field: "disc"}],
-                                     trclass: "primsearch noxd",
+                                     trclass: "primsearch",
                                      whenEmpty: L("lcl_search_generic")
                                    });
 
@@ -213,7 +213,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
                               onChange: "onChangeSrtdeel",
                               urlAdd: [{urlParam: "srtgroep_key", field: "srtgroep"},
                                        {urlParam: "disc_key", field: "disc"}],
-                              trclass: "primsearch noxd",
+                              trclass: "primsearch",
                               whenEmpty: L("lcl_search_generic")  // want dit is een filter
                             });
 
@@ -233,12 +233,13 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
                                  { label: L("lcl_mjb_scenario"),
                                    initKey: scen_key,
                                    //multi: true, // Voor nu niet multi
-                                   trclass:"primsearch noxd",
+                                   trclass:"primsearch",
                                    emptyKey: 1,
                                    emptyOption: "",
                                    onChange: "onChangeScenario()"
                                  });
-                    RWCHECKBOXTR("actsit", "fldactsit", L("lcl_mjb_also_act_situation"), actsit, { html: " value='1' ", trclass: 'primsearch noxd tractsit'});
+                    RWCHECKBOXTR("actsit", "fldactsit", L("lcl_mjb_also_act_situation"), actsit, { html: " value='1' ", trclass: 'primsearch tractsit'});
+                    RWCHECKBOXTR("mjbshowempty", "fldmjbempty", L("lcl_mjb_empty_lines_too"), mjbempty, { html: " value='1' ", trclass: 'primsearch'});
                   }
                   oRs.Close();
               }
@@ -266,7 +267,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
                            { initKey: categorie_key,
                            	 label: L("ctr_discipline"),
                              emptyOption: L("lcl_all"),
-                             trclass: "primsearch noxd"
+                             trclass: "primsearch"
                            });
 
               // <!-- Groep-->
@@ -283,7 +284,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
                            { initKey: groep,
                            	 label: L("ins_srtcontrole_groep"),
                              emptyOption: L("lcl_all"),
-                             trclass: "primsearch noxd"
+                             trclass: "primsearch"
                            });
 
               sql = "SELECT ins_srtcontrole_key"
@@ -304,7 +305,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
                            { initKey: srtcontrole,
                              label: L("lcl_ins_controle_srt"),
                              multi: true,
-                             trclass:"primsearch noxd",
+                             trclass:"primsearch",
                              emptyOption: ""
                            });
               sql = "SELECT DISTINCT COALESCE(xcp.ins_srtcontroledl_xcp_periode, isc.ins_srtcontrole_periode) periode_key"
@@ -320,11 +321,11 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
                            { initKey: frequentie,
                              label: L("lcl_mjb_frequency"),
                              multi: true,
-                             trclass:"primsearch noxd",
+                             trclass:"primsearch",
                              emptyOption: ""
                            });
 
-              RWCHECKBOXTR("incbtw", "fldincbtw", L("lcl_mjb_inclbtw"), incbtw, { html: " value='1' ", trclass: 'noxd'});
+              RWCHECKBOXTR("incbtw", "fldincbtw", L("lcl_mjb_inclbtw"), incbtw, { html: " value='1' "});
               sql = "SELECT         1, " + safe.qL("lcl_district")         + ", 1 FROM DUAL"
                   + " UNION SELECT  2, " + safe.qL("lcl_building")         + ", 2 FROM DUAL"
                   + " UNION SELECT  3, " + safe.qL("lcl_discipline")          + ", 3 FROM DUAL"
diff --git a/APPL/MJB/mjb_search_list.asp b/APPL/MJB/mjb_search_list.asp
index 24dcbadd3a..627b10e337 100644
--- a/APPL/MJB/mjb_search_list.asp
+++ b/APPL/MJB/mjb_search_list.asp
@@ -78,6 +78,7 @@ var incbtw = getQParamInt("incbtw", 0) == 1; // Lijst inclusief BTW weergeven.
 
 var scenario = getQParamInt("scenario", 1); // Scenario
 var actsit = getQParamInt("actsit", 0) == 1; // Ook actuele situatie.
+var mjbshowempty = getQParamInt("mjbshowempty", 0) == 1; // Ook lege regels.
 
 // FORM status checkboxes
 var mjbMoved  = getQParamInt("mjbMoved", 0) == 1; // Verschoven.
@@ -950,6 +951,21 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
       return lclass;
     }
 
+    // true als er *ergens* een bedrag is ingevuld
+    function fnrowFilter(oRs)
+    {
+      if (mjbshowempty)
+        return true;
+
+      for (var j = 0; j < jaren.length; j++)
+      {
+          if (oRs(String(jaren[j])).Value)
+            return true;
+      }
+
+      return false;
+    }
+
 
     function fnrowActionEnabler(oRs)
     {
@@ -1158,6 +1174,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
                                    ID: "mjobtable",
                                    rowData: fnrowData,
                                    rowClass: fnrowClass,
+                                   rowFilter: fnrowFilter,
                                    //suppressKeyRepeat: "alg_locatie_omschrijving",
                                    rowActionEnabler: fnrowActionEnabler,
                                    totalShow: totalShow,
diff --git a/APPL/Shared/resultset_table_v2.inc b/APPL/Shared/resultset_table_v2.inc
index d61fe3bbd5..70141de6a9 100644
--- a/APPL/Shared/resultset_table_v2.inc
+++ b/APPL/Shared/resultset_table_v2.inc
@@ -208,6 +208,7 @@ ResultsetTable.prototype.addColumn = __rsAddColumn;
 ResultsetTable.prototype.startPrint = __rsStartPrint;
 ResultsetTable.prototype.endPrint = __rsEndPrint;
 ResultsetTable.prototype.addAction = __rsAddAction;
+ResultsetTable.prototype.rowFilter = function (oRs) { return true };
 
 function __rsAddAction(params)
 {
@@ -845,7 +846,8 @@ function __rsProcessResultset(processParams) // processParams wordt blind aan al
       lastHadFlex = !noFlexResult;
 
       // Een row van ResultsetTable
-      html += makeTableRow(oRs, oRsFlexData, cnt, anyMultiActions, noFlexResult);
+      if (rowFilter(oRs))
+          html += makeTableRow(oRs, oRsFlexData, cnt, anyMultiActions, noFlexResult);
       if (this.buildHistogram)
         this.countHistogram(oRs);