diff --git a/APPL/FAC/fac_edit_faq.asp b/APPL/FAC/fac_edit_faq.asp
index 141f93357c..59f5b8dceb 100644
--- a/APPL/FAC/fac_edit_faq.asp
+++ b/APPL/FAC/fac_edit_faq.asp
@@ -123,9 +123,9 @@ else
             label: L("lcl_faq_level")
           });
 
-        var displaySql = "           SELECT 0, " + safe.qL("lcl_faq_display_popup")     + " FROM DUAL"
+        var displaySql = "           SELECT 2, " + safe.qL("lcl_faq_display_popup")     + " FROM DUAL"
                        + " UNION ALL SELECT 1, " + safe.qL("lcl_faq_display_screen")    + " FROM DUAL"
-                       + " UNION ALL SELECT 2, " + safe.qL("lcl_faq_display_both_edit") + " FROM DUAL";
+                       + " UNION ALL SELECT 0, " + safe.qL("lcl_faq_display_both_edit") + " FROM DUAL";
 
         FCLTselector("fac_faq_displaymode",
                      displaySql,
diff --git a/APPL/FAC/fac_show_faq.asp b/APPL/FAC/fac_show_faq.asp
index e3d785b2ad..b3dd78f9ca 100644
--- a/APPL/FAC/fac_show_faq.asp
+++ b/APPL/FAC/fac_show_faq.asp
@@ -141,9 +141,9 @@ var canChange = canWriteFAQBOF || (canWriteFAQFOF && datum == null)
             BLOCK_START("mldInfo", L("lcl_faq_itemadm"));
             ROFIELDTR("fld",          L("lcl_faq_level"),       fac.getfaqleveltext(level));
 
-            var displaySql = "           SELECT 0, " + safe.qL("lcl_faq_display_popup")     + " FROM DUAL"
+            var displaySql = "           SELECT 2, " + safe.qL("lcl_faq_display_popup")     + " FROM DUAL"
                            + " UNION ALL SELECT 1, " + safe.qL("lcl_faq_display_screen")    + " FROM DUAL"
-                           + " UNION ALL SELECT 2, " + safe.qL("lcl_faq_display_both_show") + " FROM DUAL";
+                           + " UNION ALL SELECT 0, " + safe.qL("lcl_faq_display_both_show") + " FROM DUAL";
 
             FCLTselector("fld",
                          displaySql,
diff --git a/APPL/MLD/mld.inc b/APPL/MLD/mld.inc
index 6cd52ec9f5..42a01e13d0 100644
--- a/APPL/MLD/mld.inc
+++ b/APPL/MLD/mld.inc
@@ -2775,7 +2775,7 @@ mld = {setmeldingstatus:
 
                   var filtWHERE = "   AND ff.fac_faq_key = sf.fac_faq_key"
                                 + "   AND ff.fac_faq_key = af.fac_faq_key"
-                                + "   AND ff.fac_faq_displaymode <> 0"
+                                + "   AND ff.fac_faq_displaymode <> 2"
                                 + "   AND af.alg_onroerendgoed_keys = og.alg_onroerendgoed_keys(+)"
                                 + "   AND ";
 
@@ -2815,7 +2815,7 @@ mld = {setmeldingstatus:
                                + "     , alg_v_onroerendgoed og";
 
                   var filtWHERE = "   AND ff.fac_faq_key = af.fac_faq_key"
-                                + "   AND ff.fac_faq_displaymode <> 0"
+                                + "   AND ff.fac_faq_displaymode <> 2"
                                 + "   AND af.alg_onroerendgoed_keys = og.alg_onroerendgoed_keys(+)";
 
                   // Stdmfilter
@@ -2882,7 +2882,7 @@ mld = {setmeldingstatus:
               {
                   var displaymode = oRs("displaymode").Value;
 
-                  // Displaymode 0; No fixed display; 1; No pop-up; 2; Show both
+                  // Displaymode 0; Show both; 1; No pop-up; 2; No fixed display
                   if (!(displaymode & 1)) // Popup
                   {
                       if (   ((S("faq_kennisbank_popup") & 1) && canFAQUSEread)  // Voor FE
@@ -2890,7 +2890,7 @@ mld = {setmeldingstatus:
                           result.popup_faq = true;
                   }
 
-                  if (displaymode != 0)
+                  if (displaymode != 2)
                   {
                       var data = { faq_key: oRs("fac_faq_key").Value,
                                    has_kenm: oRs("aantal_kenm").Value > 0,
diff --git a/APPL/MLD/mld_show_melding.js b/APPL/MLD/mld_show_melding.js
index af6ea4b9d0..ff2dbee534 100644
--- a/APPL/MLD/mld_show_melding.js
+++ b/APPL/MLD/mld_show_melding.js
@@ -358,10 +358,10 @@ function mld_show_kennisbank(data)
                                                  $(this).toggleClass('flexcollapsed');
                                                  FcltMgr.resized(window);
                                                });
-          $tbl.append($newrow)
+          $tbl.append($newrow);
           var safeanswer = $("<span>").text(data.fixed_faq[i].answer).text().replace(/\n/g, "<br>");
           if (data.fixed_faq[i].hurl)
-            safeanswer += "<br><a href={0} target='_new'>{1}</a>".format(fixed_faq[i].hurl, fixed_faq[i].hlnk);
+            safeanswer += "<br><a href={0} target='_new'>{1}</a>".format(data.fixed_faq[i].hurl, data.fixed_faq[i].hlnk);
           else if (data.fixed_faq[i].has_kenm)
             safeanswer += "<br><div class='faqlink'><a href='javascript:showFaq("+data.fixed_faq[i].faq_key+")'>"+L('lcl_more')+"</a></div>";
           $tbl.append("<tr style='display:none' class='"+data.fixed_faq[i].faq_type+"'><td class='fixedfaqanswer'><span='fclthtml'>" + safeanswer + "</span></td></tr>");