diff --git a/docs/_templates/facility_page.rst b/docs/_templates/facility_page.rst
index b038a34..dd2a2e4 100644
--- a/docs/_templates/facility_page.rst
+++ b/docs/_templates/facility_page.rst
@@ -27,17 +27,15 @@ Following **Instruments** are present:
 {% endfor %}
 
 {% for filter_info in inst_data.itertuples() %}
-   * - {{ filter_info[0] }}
-     - {{ filter_info[1] }}
-     - {{ filter_info[2] }}
-     - {{ filter_info[3] }}
-     - {{ filter_info[4] }}
-     - {{ filter_info[5] }}
-     - {{ filter_info[6] }}
-     - {{ filter_info[7] }}
-     - {{ filter_info[8] }}
-     - {{ filter_info[9] }}
-     - {{ filter_info[10]|replace('_ ','\_ ') }}
+{% for info in filter_info %}
+{% if loop.first %}
+   * - {{ info }}
+{% elif loop.last %}
+     - {{ info|replace('_ ','\_ ') }}
+{% else %}
+     - {{ info }}
+{% endif %}
+{% endfor %}
 {% endfor %}
 
 
diff --git a/docs/conf.py b/docs/conf.py
index 2c80bd9..e0f6f3e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -229,4 +229,4 @@ def setup(app):
 os.makedirs('_facility_pages', exist_ok=True)
 for facility in facility_list:
     shutil.copyfile('_templates/facility_page.rst',
-                    os.path.join('_facility_pages', facility + '.rst'))
+                    os.path.join('_facility_pages', '{0}.rst'.format(facility)))