diff --git a/_includes/devcsv.html b/_includes/devcsv.html
index 5375720..c9adb96 100644
--- a/_includes/devcsv.html
+++ b/_includes/devcsv.html
@@ -4,8 +4,9 @@ function warnFaketad() {
 }
 </script>
 <!-- Get first entry in CSV for the desired program. The credit/banner/name/origin should be the same across all files, listing multiple items in each line if there are differences. -->
-{% assign ENTRY = site.data.dsinfo | find:"PROGRAM",page.app %}
-
+{% for ENTRY in site.data.dsinfo %}
+  {% if ENTRY.PROGRAM == page.app %}
+    {% if ENTRY.PUBLISHED == "TRUE" %}
 <!--
 <div class="imageTwo" style="position:relative;width:100%;height:14vw;">
   <div class="homeimg">
@@ -96,4 +97,7 @@ function warnFaketad() {
   </table>
   </div>
 
-</div>
\ No newline at end of file
+</div>
+    {% endif %}
+  {% endif %}
+{% endfor %}
\ No newline at end of file
diff --git a/_layouts/dsiware.html b/_layouts/dsiware.html
index d1cdf54..7232975 100755
--- a/_layouts/dsiware.html
+++ b/_layouts/dsiware.html
@@ -11,7 +11,9 @@
       <meta property="og:description" content="DS(i) development software documentation and preservation.">
       <meta name="keywords" content="dsi, ds, nintendo, dev" />
     {% else %}
-      {% assign ENTRY = site.data.dsinfo | find:"PROGRAM",page.app %}
+{% for ENTRY in site.data.dsinfo %}
+  {% if ENTRY.PROGRAM == page.app %}
+    {% if ENTRY.PUBLISHED == "TRUE" %}
       <title>{{ page.app }} | {{ site.title }}</title>
       <meta property="og:title" content="{{ page.app }}">
       <meta property="og:image" content="{{ site.imgurl }}{{ ENTRY.PROGRAM }}/{{ ENTRY.PROGRAM }}.gif">
@@ -19,6 +21,9 @@
       <meta property="og:description" content="{{ ENTRY.DESC }} for {{ ENTRY.SYSTEM }}">
       <meta name="keywords" content="dsi, ds, nintendo, dev, {{ page.app }}" />
     {% endif %}
+  {% endif %}
+{% endfor %}
+    {% endif %}
     <link rel="icon" type="image/png" href="/icon.png"/>
     <link rel="stylesheet" type="text/css" href="/assets/css/styledsi.css">
     <link id="pagestyle" rel="stylesheet" type="text/css" href="">
diff --git a/pages/jekylltests.html b/pages/jekylltests.html
index d3f3ffa..e285af5 100644
--- a/pages/jekylltests.html
+++ b/pages/jekylltests.html
@@ -3,7 +3,6 @@ Title: Stuff
 Layout: dsiware
 app: TwlNmenu
 ---
-{% comment %}
 <!--
   Notes on the CSV values:
   PROGRAM:   Name as seen in rmc-dsi directory
@@ -25,24 +24,19 @@ app: TwlNmenu
   TITLE:     Program title
   DESC:      Program description as seen on index.html
 -->
-{% endcomment %}
 
-      {% assign ENTRY = site.data.dsinfo | find:"PROGRAM",page.app %}
-      <p>{{ page.app }} | {{ site.title }}<br>
+{% for ENTRY in site.data.dsinfo %}
+  {% if ENTRY.PROGRAM == page.app %}
+    {% if ENTRY.PUBLISHED == "TRUE" %}
+        <p>{{ page.app }} | {{ site.title }}<br>
       {{ page.app }}<br>
       {{ site.imgurl }}{{ ENTRY.PROGRAM }}/{{ ENTRY.PROGRAM }}.gif<br>
       {{ ENTRY.DESC }} for {{ ENTRY.SYSTEM }}<br>
       {{ ENTRY.DESC }} for {{ ENTRY.SYSTEM }}<br>
       dsi, ds, nintendo, dev, {{ page.app }}</p>
-      <hr>
-      {% assign ENTRY = site.data.dsinfo | find:"PROGRAM","TwlNmenu" %}
-      <p>{{ page.app }} | {{ site.title }}<br>
-      {{ page.app }}<br>
-      {{ site.imgurl }}{{ ENTRY.PROGRAM }}/{{ ENTRY.PROGRAM }}.gif<br>
-      {{ ENTRY.DESC }} for {{ ENTRY.SYSTEM }}<br>
-      {{ ENTRY.DESC }} for {{ ENTRY.SYSTEM }}<br>
-      dsi, ds, nintendo, dev, {{ page.app }}</p>
-      <h1>^ Attempt to figure out why things are broken ^</h1>
+    {% endif %}
+  {% endif %}
+{% endfor %}
 
 <!-- Check all DS program info -->
 <style>