diff --git a/site/_includes/docs_option.html b/site/_includes/docs_option.html
index c2593971..e7afcc88 100644
--- a/site/_includes/docs_option.html
+++ b/site/_includes/docs_option.html
@@ -1,11 +1,5 @@
-{% assign items = include.items %}
-
-{% for item in items %}
+{% for item in include.items %}
   {% assign item_url = item | prepend:"/docs/" | append:"/" %}
-
-  {% for p in site.docs %}
-    {% if p.url == item_url %}
-      <option value="{{ site.url }}{{ p.url }}">{{ p.title }}</option>
-    {% endif %}
-  {% endfor %}
+  {% assign doc = site.docs | where: "url", item_url | first %}
+  <option value="{{ site.url }}{{ doc.url }}">{{ doc.title }}</option>
 {% endfor %}
diff --git a/site/_includes/docs_ul.html b/site/_includes/docs_ul.html
index 34b6278a..7688328f 100644
--- a/site/_includes/docs_ul.html
+++ b/site/_includes/docs_ul.html
@@ -1,17 +1,7 @@
-{% assign items = include.items %}
-
 <ul>
-{% for item in items %}
+{% for item in include.items %}
   {% assign item_url = item | prepend:"/docs/" | append:"/" %}
-
-  {% if item_url == page.url %}
-    {% assign c = "current" %}
-  {% else %}
-    {% assign c = "" %}
-  {% endif %}
-
-  {% assign p = site.docs | where:"url",item_url | first %}
-  <li class="{{ c }}"><a href="{{ site.url }}{{ p.url }}">{{ p.title }}</a></li>
-
+  {% assign p = site.docs | where:"url", item_url | first %}
+  <li class="{% if item_url == page.url %}current{% endif %}"><a href="{{ site.url }}{{ p.url }}">{{ p.title }}</a></li>
 {% endfor %}
 </ul>