diff --git a/templates/liquid/ActivityDefinition.liquid b/templates/liquid/ActivityDefinition.liquid
index 62bb7d2..7cbbcb5 100644
--- a/templates/liquid/ActivityDefinition.liquid
+++ b/templates/liquid/ActivityDefinition.liquid
@@ -71,26 +71,26 @@
             {%if ActivityDefinition.subject is CodeableConcept %}
             <td style="padding-left: 4px;">
                 {% if ActivityDefinition.subject.coding.exists() %}
-                    {% for coding in ActivityDefinition.subject.coding %}
-                        {% if coding.system.exists() %}
-                        <p style="margin-bottom: 5px;">
-                            <b>system: </b> <span>{{coding.system}}</span>
-                        </p>
-                        {% endif %}
-                        {% if coding.code.exists() %}
-                        <p style="margin-bottom: 5px;">
-                            <b>code: </b> <span>{{coding.code}}</span>
-                        </p>
-                        {% endif %}
-                        {% if coding.display.exists() %}
-                        <p style="margin-bottom: 5px;">
-                            <b>display: </b> <span>{{coding.display}}</span>
-                        </p>
-                        {% endif %}
-                    {% endfor %}
+                {% for coding in ActivityDefinition.subject.coding %}
+                {% if coding.system.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>system: </b> <span>{{coding.system}}</span>
+                </p>
+                {% endif %}
+                {% if coding.code.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>code: </b> <span>{{coding.code}}</span>
+                </p>
+                {% endif %}
+                {% if coding.display.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>display: </b> <span>{{coding.display}}</span>
+                </p>
+                {% endif %}
+                {% endfor %}
                 {% endif %}
                 {% if ActivityDefinition.subject.coding.exists().not and ActivityDefinition.subject.text.exists() %}
-                    {{ActivityDefinition.subject.text}}
+                {{ActivityDefinition.subject.text}}
                 {% endif %}
             </td>
             {% endif %}
@@ -133,20 +133,26 @@
             <td style="padding-left: 4px;">{{ActivityDefinition.description.escape('html')}}</td>
         </tr>
         {% endif %}
-        {% if ActivityDefinition.extension.where(url = 'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability').exists() %}
+        {% if ActivityDefinition.extension.where(url =
+        'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability').exists() %}
         <tr>
-          <th scope="row"><b>Knowledge Capability: </b></th>
-          <td style="padding-left: 4px;">
-            {% for extension in ActivityDefinition.extension.where(url = 'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability') %}{{extension.value}} {% endfor %}
-          </td>
+            <th scope="row"><b>Knowledge Capability: </b></th>
+            <td style="padding-left: 4px;">
+                {% for extension in ActivityDefinition.extension.where(url =
+                'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability') %}{{extension.value}} {%
+                endfor %}
+            </td>
         </tr>
         {% endif %}
-        {% if ActivityDefinition.extension.where(url = 'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeRepresentationLevel').exists() %}
+        {% if ActivityDefinition.extension.where(url =
+        'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeRepresentationLevel').exists() %}
         <tr>
-          <th scope="row"><b>Knowledge Representation Level: </b></th>
-          <td style="padding-left: 4px;">
-            {% for extension in ActivityDefinition.extension.where(url = 'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeRepresentationLevel') %}{{extension.value}}{% endfor %}
-          </td>
+            <th scope="row"><b>Knowledge Representation Level: </b></th>
+            <td style="padding-left: 4px;">
+                {% for extension in ActivityDefinition.extension.where(url =
+                'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeRepresentationLevel')
+                %}{{extension.value}}{% endfor %}
+            </td>
         </tr>
         {% endif %}
         {% if ActivityDefinition.useContext.exists() %}
@@ -154,13 +160,17 @@
             <th scope="row"><b>Use Context: </b></th>
             <td style="padding-left: 4px;">
                 <table class="grid-dict">
-                    <tr><th><b>code</b></th><th><b>value</b></th><th><b>display</b></th></tr>
+                    <tr>
+                        <th><b>code</b></th>
+                        <th><b>value</b></th>
+                        <th><b>display</b></th>
+                    </tr>
                     {% for useContext in ActivityDefinition.useContext %}
-                      <tr>
+                    <tr>
                         <td>{{useContext.code.code}}</td>
                         <td>{{(useContext.value as CodeableConcept).coding.first().code}}</td>
                         <td>{{(useContext.value as CodeableConcept).coding.first().display.escape('html')}}</td>
-                      </tr>
+                    </tr>
                     {% endfor %}
                 </table>
             </td>
@@ -205,82 +215,98 @@
         {% if ActivityDefinition.effectivePeriod.exists() %}
         <tr>
             <th scope="row"><b>Effective Period: </b></th>
-            <td style="padding-left: 4px;">{{ActivityDefinition.effectivePeriod.start}}..{{ActivityDefinition.effectivePeriod.end}}</td>
+            <td style="padding-left: 4px;">
+                {{ActivityDefinition.effectivePeriod.start}}..{{ActivityDefinition.effectivePeriod.end}}</td>
         </tr>
         {% endif %}
         {% if ActivityDefinition.relatedArtifact.exists() %}
         <tr>
-          <th scope="row"><b>Related Artifacts: </b></th>
-          <td style="padding-left: 4px;">
-            {% if ActivityDefinition.relatedArtifact.where(type = 'documentation' or type = 'justification').exists() %}
-            <p><b>Documentation</b></p>
-            <ul>
-              {% for artifact in ActivityDefinition.relatedArtifact.where(type = 'documentation' or type = 'justification') %}
-                <li><a href="{{artifact.url}}">{{artifact.label}} {{artifact.display.escape('html')}}</a></li>
-              {% endfor %}
-            </ul>
-            {% endif %}
-            {% if ActivityDefinition.relatedArtifact.where(type = 'citation').exists() %}
-            <p><b>References</b></p>
-            <ul>
-              {% for artifact in ActivityDefinition.relatedArtifact.where(type = 'citation') %}
-                <li>{{artifact.citation}}<br/><a href="{{artifact.url}}">{{artifact.url}}</a></li>
-              {% endfor %}
-            </ul>
-            {% endif %}
-            {% if ActivityDefinition.relatedArtifact.where(type = 'depends-on').exists() %}
-            <p><b>Dependencies</b></p>
-            <ul>
-              {% for artifact in ActivityDefinition.relatedArtifact.where(type = 'depends-on') %}
-                <li>{{artifact.resource}}</li>
-              {% endfor %}
-            </ul>
-            {% endif %}
-            {% if ActivityDefinition.relatedArtifact.where(type = 'composed-of').exists() %}
-            <p><b>Components</b></p>
-            <ul>
-              {% for artifact in ActivityDefinition.relatedArtifact.where(type = 'composed-of') %}
-                <li>{{artifact.resource}}</li>
-              {% endfor %}
-            </ul>
-            {% endif %}
-            {% if ActivityDefinition.relatedArtifact.where(type = 'derived-from').exists() %}
-            <p><b>Derived From</b></p>
-            <ul>
-              {% for artifact in ActivityDefinition.relatedArtifact.where(type = 'derived-from') %}
-                <li>{{artifact.resource}}</li>
-              {% endfor %}
-            </ul>
-            {% endif %}
-            {% if ActivityDefinition.relatedArtifact.where(type = 'successor').exists() %}
-            <p><b>Successor</b></p>
-            <ul>
-              {% for artifact in ActivityDefinition.relatedArtifact.where(type = 'successor') %}
-                <li>{{artifact.resource}}</li>
-              {% endfor %}
-            </ul>
-            {% endif %}
-            {% if ActivityDefinition.relatedArtifact.where(type = 'predecessor').exists() %}
-            <p><b>Predecessor</b></p>
-            <ul>
-              {% for artifact in ActivityDefinition.relatedArtifact.where(type = 'predecessor') %}
-                <li>{{artifact.resource}}</li>
-              {% endfor %}
-            </ul>
-            {% endif %}
-          </td>
+            <th scope="row"><b>Related Artifacts: </b></th>
+            <td style="padding-left: 4px;">
+                {% if ActivityDefinition.relatedArtifact.where(type = 'documentation' or type =
+                'justification').exists() %}
+                <p><b>Documentation</b></p>
+                <ul>
+                    {% for artifact in ActivityDefinition.relatedArtifact.where(type = 'documentation' or type =
+                    'justification') %}
+                    <li><a href="{{artifact.url}}">{{artifact.label}} {{artifact.display.escape('html')}}</a></li>
+                    {% endfor %}
+                </ul>
+                {% endif %}
+                {% if ActivityDefinition.relatedArtifact.where(type = 'citation').exists() %}
+                <p><b>References</b></p>
+                <ul>
+                    {% for artifact in ActivityDefinition.relatedArtifact.where(type = 'citation') %}
+                    <li>{{artifact.citation}}<br /><a href="{{artifact.url}}">{{artifact.url}}</a></li>
+                    {% endfor %}
+                </ul>
+                {% endif %}
+                {% if ActivityDefinition.relatedArtifact.where(type = 'depends-on').exists() %}
+                <p><b>Dependencies</b></p>
+                <table class="grid-dict">
+                    <tr>
+                        <th><b>Display</b></th>
+                        <th><b>Resource Identifier &amp; Version</b></th>
+                    </tr>
+                    {% for artifact in ActivityDefinition.relatedArtifact.where(type = 'depends-on') %}
+                    <tr>
+                        <td>
+                            {{artifact.display}}
+                        </td>
+                        <td>
+                            <a href="{{artifact.resource}}">{{artifact.resource}}</a>
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </table>
+                {% endif %}
+                {% if ActivityDefinition.relatedArtifact.where(type = 'composed-of').exists() %}
+                <p><b>Components</b></p>
+                <ul>
+                    {% for artifact in ActivityDefinition.relatedArtifact.where(type = 'composed-of') %}
+                    <li>{{artifact.resource}}</li>
+                    {% endfor %}
+                </ul>
+                {% endif %}
+                {% if ActivityDefinition.relatedArtifact.where(type = 'derived-from').exists() %}
+                <p><b>Derived From</b></p>
+                <ul>
+                    {% for artifact in ActivityDefinition.relatedArtifact.where(type = 'derived-from') %}
+                    <li>{{artifact.resource}}</li>
+                    {% endfor %}
+                </ul>
+                {% endif %}
+                {% if ActivityDefinition.relatedArtifact.where(type = 'successor').exists() %}
+                <p><b>Successor</b></p>
+                <ul>
+                    {% for artifact in ActivityDefinition.relatedArtifact.where(type = 'successor') %}
+                    <li>{{artifact.resource}}</li>
+                    {% endfor %}
+                </ul>
+                {% endif %}
+                {% if ActivityDefinition.relatedArtifact.where(type = 'predecessor').exists() %}
+                <p><b>Predecessor</b></p>
+                <ul>
+                    {% for artifact in ActivityDefinition.relatedArtifact.where(type = 'predecessor') %}
+                    <li>{{artifact.resource}}</li>
+                    {% endfor %}
+                </ul>
+                {% endif %}
+            </td>
         </tr>
         {% endif %}
         {% if ActivityDefinition.library.exists() %}
         <tr>
-          <th scope="row"><b>Libraries: </b></th>
-          <td style="padding-left: 4px;">
-            <table class="grid-dict">
-              {% for library in ActivityDefinition.library %}
-                <tr><td>{{library}}</td></tr>
-              {% endfor %}
-            </table>
-          </td>
+            <th scope="row"><b>Libraries: </b></th>
+            <td style="padding-left: 4px;">
+                <table class="grid-dict">
+                    {% for library in ActivityDefinition.library %}
+                    <tr>
+                        <td>{{library}}</td>
+                    </tr>
+                    {% endfor %}
+                </table>
+            </td>
         </tr>
         {% endif %}
         {% if ActivityDefinition.kind.exists() %}
@@ -300,26 +326,26 @@
             <th scope="row"><b>Type: </b></th>
             <td style="padding-left: 4px;">
                 {% if ActivityDefinition.code.coding.exists() %}
-                    {% for coding in ActivityDefinition.code.coding %}
-                        {% if coding.system.exists() %}
-                        <p style="margin-bottom: 5px;">
-                            <b>system: </b> <span>{{coding.system}}</span>
-                        </p>
-                        {% endif %}
-                        {% if coding.code.exists() %}
-                        <p style="margin-bottom: 5px;">
-                            <b>code: </b> <span>{{coding.code}}</span>
-                        </p>
-                        {% endif %}
-                        {% if coding.display.exists() %}
-                        <p style="margin-bottom: 5px;">
-                            <b>display: </b> <span>{{coding.display.escape('html')}}</span>
-                        </p>
-                        {% endif %}
-                    {% endfor %}
+                {% for coding in ActivityDefinition.code.coding %}
+                {% if coding.system.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>system: </b> <span>{{coding.system}}</span>
+                </p>
+                {% endif %}
+                {% if coding.code.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>code: </b> <span>{{coding.code}}</span>
+                </p>
+                {% endif %}
+                {% if coding.display.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>display: </b> <span>{{coding.display.escape('html')}}</span>
+                </p>
+                {% endif %}
+                {% endfor %}
                 {% endif %}
                 {% if ActivityDefinition.code.coding.exists().not and ActivityDefinition.code.text.exists() %}
-                    {{ActivityDefinition.code.text}}
+                {{ActivityDefinition.code.text}}
                 {% endif %}
             </td>
         </tr>
@@ -348,26 +374,26 @@
             {%if ActivityDefinition.product is CodeableConcept %}
             <td style="padding-left: 4px;">
                 {% if ActivityDefinition.product.coding.exists() %}
-                    {% for coding in ActivityDefinition.product.coding %}
-                        {% if coding.system.exists() %}
-                        <p style="margin-bottom: 5px;">
-                            <b>system: </b> <span>{{coding.system}}</span>
-                        </p>
-                        {% endif %}
-                        {% if coding.code.exists() %}
-                        <p style="margin-bottom: 5px;">
-                            <b>code: </b> <span>{{coding.code}}</span>
-                        </p>
-                        {% endif %}
-                        {% if coding.display.exists() %}
-                        <p style="margin-bottom: 5px;">
-                            <b>display: </b> <span>{{coding.display.escape('html')}}</span>
-                        </p>
-                        {% endif %}
-                    {% endfor %}
+                {% for coding in ActivityDefinition.product.coding %}
+                {% if coding.system.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>system: </b> <span>{{coding.system}}</span>
+                </p>
+                {% endif %}
+                {% if coding.code.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>code: </b> <span>{{coding.code}}</span>
+                </p>
+                {% endif %}
+                {% if coding.display.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>display: </b> <span>{{coding.display.escape('html')}}</span>
+                </p>
+                {% endif %}
+                {% endfor %}
                 {% endif %}
                 {% if ActivityDefinition.product.coding.exists().not and ActivityDefinition.product.text.exists() %}
-                    {{ActivityDefinition.product.text}}
+                {{ActivityDefinition.product.text}}
                 {% endif %}
             </td>
             {% endif %}
@@ -396,7 +422,7 @@
         <tr>
             <th scope="row"><b>Quantity: </b></th>
             <td style="padding-left: 4px;">
-              {{ActivityDefinition.quantity.value}} <i>({{ActivityDefinition.quantity.unit.escape('html')}})</i><br/>
+                {{ActivityDefinition.quantity.value}} <i>({{ActivityDefinition.quantity.unit.escape('html')}})</i><br />
             </td>
         </tr>
         {% endif %}
@@ -405,12 +431,15 @@
             <th scope="row"><b>Body Site(s): </b></th>
             <td style="padding-left: 4px;">
                 <table class="grid-dict">
-                    <tr><th><b>code</b></th><th><b>display</b></th></tr>
+                    <tr>
+                        <th><b>code</b></th>
+                        <th><b>display</b></th>
+                    </tr>
                     {% for bodySite in ActivityDefinition.bodySite %}
-                      <tr>
+                    <tr>
                         <td>{{bodySite.coding.first().code}}</td>
                         <td>{{bodySite.coding.first().display.escape('html')}}</td>
-                      </tr>
+                    </tr>
                     {% endfor %}
                 </table>
             </td>
@@ -420,13 +449,13 @@
         <tr>
             <th scope="row"><b>Dynamic Values: </b></th>
             <td style="padding-left: 4px;">
-              {% for dynamicValue in ActivityDefinition.dynamicValue %}
+                {% for dynamicValue in ActivityDefinition.dynamicValue %}
                 <li>
-                  {{dynamicValue.path}}: <i>({{dynamicValue.expression.expression.escape('html')}})</i><br/>
+                    {{dynamicValue.path}}: <i>({{dynamicValue.expression.expression.escape('html')}})</i><br />
                 </li>
-              {% endfor %}
+                {% endfor %}
             </td>
         </tr>
         {% endif %}
     </table>
-</div>
+</div>
\ No newline at end of file
diff --git a/templates/liquid/Library.liquid b/templates/liquid/Library.liquid
index ba38232..8432c45 100644
--- a/templates/liquid/Library.liquid
+++ b/templates/liquid/Library.liquid
@@ -258,12 +258,20 @@
             </ul>
             {% endif %}
             {% if Library.relatedArtifact.where(type = 'depends-on').exists() %}
-            <p><b>Dependencies</b></p>
-            <ul>
-              {% for artifact in Library.relatedArtifact.where(type = 'depends-on') %}
-                <li>{{artifact.resource}}</li>
-              {% endfor %}
-            </ul>
+              <p><b>Dependencies</b></p>
+              <table class="grid-dict">
+                <tr><th><b>Display</b></th><th><b>Resource Identifier &amp; Version</b></th></tr>
+                {% for artifact in Library.relatedArtifact.where(type = 'depends-on') %}
+                  <tr>
+                    <td>
+                      {{artifact.display}}
+                    </td>
+                    <td>
+                      <a href="{{artifact.resource}}">{{artifact.resource}}</a>
+                    </td>
+                  </tr>
+                {% endfor %}
+              </table>
             {% endif %}
             {% if Library.relatedArtifact.where(type = 'composed-of').exists() %}
             <p><b>Components</b></p>
diff --git a/templates/liquid/Measure.liquid b/templates/liquid/Measure.liquid
index 99f173a..a41a71e 100644
--- a/templates/liquid/Measure.liquid
+++ b/templates/liquid/Measure.liquid
@@ -1,716 +1,842 @@
 <div>
     <table class="grid dict">
         {% if Measure.id.exists() %}
-            <tr>
-                <th scope="row"><b>Id: </b></th>
-                <td style="padding-left: 4px;">{{Measure.id}}</td>
-            </tr>
-            <tr>
-                <th scope="row"><b>Download cql: </b></th>
-                <td style="padding-left: 4px;"><a href="Library-{{Measure.id}}.cql">Library-{{Measure.id}}.cql</a></td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Id: </b></th>
+            <td style="padding-left: 4px;">{{Measure.id}}</td>
+        </tr>
+        <tr>
+            <th scope="row"><b>Download cql: </b></th>
+            <td style="padding-left: 4px;"><a href="Library-{{Measure.id}}.cql">Library-{{Measure.id}}.cql</a></td>
+        </tr>
         {% endif %}
         {% if Measure.url.exists() %}
-            <tr>
-                <th scope="row"><b>Url: </b></th>
-                <td style="padding-left: 4px;">{{Measure.url}}</td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Url: </b></th>
+            <td style="padding-left: 4px;">{{Measure.url}}</td>
+        </tr>
         {% endif %}
         {% if Measure.version.exists() %}
-            <tr>
-                <th scope="row"><b>Version: </b></th>
-                <td style="padding-left: 4px;">{{Measure.version}}</td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Version: </b></th>
+            <td style="padding-left: 4px;">{{Measure.version}}</td>
+        </tr>
         {% endif %}
         {% for identifier in Measure.identifier %}
-            <tr>
-                <th scope="row"><b>Identifier: </b></th>
-                <td style="padding-left: 4px;">
-                    {% if identifier.type.exists() %}
-                        <p style="margin-bottom: 5px;">
-                            <b>type: </b> <span>{{identifier.type.value}}</span>
-                        </p>
-                    {% endif %}
-                    {% if identifier.value.exists() %}
-                        <p style="margin-bottom: 5px;">
-                            <b>value: </b> <span>{{identifier.value}}</span>
-                        </p>
-                    {% endif %}
-                </td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Identifier: </b></th>
+            <td style="padding-left: 4px;">
+                {% if identifier.type.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>type: </b> <span>{{identifier.type.value}}</span>
+                </p>
+                {% endif %}
+                {% if identifier.value.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>value: </b> <span>{{identifier.value}}</span>
+                </p>
+                {% endif %}
+            </td>
+        </tr>
         {% endfor %}
         {% if Measure.name.exists() %}
-            <tr>
-                <th scope="row"><b>Name: </b></th>
-                <td style="padding-left: 4px;">{{Measure.name}}</td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Name: </b></th>
+            <td style="padding-left: 4px;">{{Measure.name}}</td>
+        </tr>
         {% endif %}
         {% if Measure.title.exists() %}
-            <tr>
-                <th scope="row"><b>Title: </b></th>
-                <td style="padding-left: 4px;">{{Measure.title.escape('html')}}</td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Title: </b></th>
+            <td style="padding-left: 4px;">{{Measure.title.escape('html')}}</td>
+        </tr>
         {% endif %}
         {% if Measure.subtitle.exists() %}
-            <tr>
-                <th scope="row"><b>Subtitle: </b></th>
-                <td style="padding-left: 4px;">{{Measure.subtitle.escape('html')}}</td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Subtitle: </b></th>
+            <td style="padding-left: 4px;">{{Measure.subtitle.escape('html')}}</td>
+        </tr>
         {% endif %}
         {% if Measure.status.exists() %}
-            <tr>
-                <th scope="row"><b>Status: </b></th>
-                <td style="padding-left: 4px;">{{Measure.status.value}}</td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Status: </b></th>
+            <td style="padding-left: 4px;">{{Measure.status.value}}</td>
+        </tr>
         {% endif %}
         {% if Measure.experimental.exists() %}
-            <tr>
-                <th scope="row"><b>Experimental: </b></th>
-                <td style="padding-left: 4px;">{{Measure.experimental.value}}</td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Experimental: </b></th>
+            <td style="padding-left: 4px;">{{Measure.experimental.value}}</td>
+        </tr>
         {% endif %}
         {% if Measure.scoring.exists() %}
-            <tr>
-                <th scope="row"><b>Scoring: </b></th>
-                <td style="padding-left: 4px;">
-                    {% if Measure.scoring.coding.exists() %}
-                        {% for coding in Measure.scoring.coding %}
-                            {% if coding.system.exists() %}
-                                <p style="margin-bottom: 5px;">
-                                    <b>system: </b> <span>{{coding.system}}</span>
-                                </p>
-                            {% endif %}
-                            {% if coding.code.exists() %}
-                                <p style="margin-bottom: 5px;">
-                                    <b>code: </b> <span>{{coding.code}}</span>
-                                </p>
-                            {% endif %}
-                            {% if coding.display.exists() %}
-                                <p style="margin-bottom: 5px;">
-                                    <b>display: </b> <span>{{coding.display.escape('html')}}</span>
-                                </p>
-                            {% endif %}
-                        {% endfor %}
-                    {% endif %}
-                    {% if Measure.scoring.coding.exists().not and Measure.scoring.text.exists() %}
-                        {{Measure.scoring.text}}
-                    {% endif %}
-                </td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Scoring: </b></th>
+            <td style="padding-left: 4px;">
+                {% if Measure.scoring.coding.exists() %}
+                {% for coding in Measure.scoring.coding %}
+                {% if coding.system.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>system: </b> <span>{{coding.system}}</span>
+                </p>
+                {% endif %}
+                {% if coding.code.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>code: </b> <span>{{coding.code}}</span>
+                </p>
+                {% endif %}
+                {% if coding.display.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>display: </b> <span>{{coding.display.escape('html')}}</span>
+                </p>
+                {% endif %}
+                {% endfor %}
+                {% endif %}
+                {% if Measure.scoring.coding.exists().not and Measure.scoring.text.exists() %}
+                {{Measure.scoring.text}}
+                {% endif %}
+            </td>
+        </tr>
         {% endif %}
         {% if Measure.improvementNotation.exists() %}
-            <tr>
-                <th scope="row"><b>Improvement Notation: </b></th>
-                <td style="padding-left: 4px;">
-                    {% if Measure.improvementNotation.coding.exists() %}
-                        {% for coding in Measure.improvementNotation.coding %}
-                            {% if coding.system.exists() %}
-                                <p style="margin-bottom: 5px;">
-                                    <b>system: </b> <span>{{coding.system}}</span>
-                                </p>
-                            {% endif %}
-                            {% if coding.code.exists() %}
-                                <p style="margin-bottom: 5px;">
-                                    <b>code: </b> <span>{{coding.code}}</span>
-                                </p>
-                            {% endif %}
-                            {% if coding.display.exists() %}
-                                <p style="margin-bottom: 5px;">
-                                    <b>display: </b> <span>{{coding.display.escape('html')}}</span>
-                                </p>
-                            {% endif %}
-                        {% endfor %}
-                    {% endif %}
-                    {% if Measure.improvementNotation.coding.exists().not and Measure.improvementNotation.text.exists() %}
-                        {{Measure.improvementNotation.text}}
-                    {% endif %}
-                </td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Improvement Notation: </b></th>
+            <td style="padding-left: 4px;">
+                {% if Measure.improvementNotation.coding.exists() %}
+                {% for coding in Measure.improvementNotation.coding %}
+                {% if coding.system.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>system: </b> <span>{{coding.system}}</span>
+                </p>
+                {% endif %}
+                {% if coding.code.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>code: </b> <span>{{coding.code}}</span>
+                </p>
+                {% endif %}
+                {% if coding.display.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>display: </b> <span>{{coding.display.escape('html')}}</span>
+                </p>
+                {% endif %}
+                {% endfor %}
+                {% endif %}
+                {% if Measure.improvementNotation.coding.exists().not and Measure.improvementNotation.text.exists() %}
+                {{Measure.improvementNotation.text}}
+                {% endif %}
+            </td>
+        </tr>
         {% endif %}
         {% if Measure.type.exists() %}
-            <tr>
-                <th scope="row"><b>Type: </b></th>
-                <td style="padding-left: 4px;">
-                    {% if Measure.type.coding.exists() %}
-                        {% for coding in Measure.type.coding %}
-                            {% if coding.system.exists() %}
-                                <p style="margin-bottom: 5px;">
-                                    <b>system: </b> <span>{{coding.system}}</span>
-                                </p>
-                            {% endif %}
-                            {% if coding.code.exists() %}
-                                <p style="margin-bottom: 5px;">
-                                    <b>code: </b> <span>{{coding.code}}</span>
-                                </p>
-                            {% endif %}
-                            {% if coding.display.exists() %}
-                                <p style="margin-bottom: 5px;">
-                                    <b>display: </b> <span>{{coding.display.escape('html')}}</span>
-                                </p>
-                            {% endif %}
-                        {% endfor %}
-                    {% endif %}
-                    {% if Measure.type.coding.exists().not and Measure.type.text.exists() %}
-                        {{Measure.type.text}}
-                    {% endif %}
-                </td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Type: </b></th>
+            <td style="padding-left: 4px;">
+                {% if Measure.type.coding.exists() %}
+                {% for coding in Measure.type.coding %}
+                {% if coding.system.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>system: </b> <span>{{coding.system}}</span>
+                </p>
+                {% endif %}
+                {% if coding.code.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>code: </b> <span>{{coding.code}}</span>
+                </p>
+                {% endif %}
+                {% if coding.display.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>display: </b> <span>{{coding.display.escape('html')}}</span>
+                </p>
+                {% endif %}
+                {% endfor %}
+                {% endif %}
+                {% if Measure.type.coding.exists().not and Measure.type.text.exists() %}
+                {{Measure.type.text}}
+                {% endif %}
+            </td>
+        </tr>
         {% endif %}
         {% if Measure.subject.exists() %}
-            <tr>
-                <th scope="row"><b>Subject: </b></th>
-                {%if Measure.subject is CodeableConcept %}
-                    <td style="padding-left: 4px;">
-                        {% if Measure.subject.coding.exists() %}
-                            {% for coding in Measure.subject.coding %}
-                                {% if coding.system.exists() %}
-                                    <p style="margin-bottom: 5px;">
-                                        <b>system: </b> <span>{{coding.system}}</span>
-                                    </p>
-                                {% endif %}
-                                {% if coding.code.exists() %}
-                                    <p style="margin-bottom: 5px;">
-                                        <b>code: </b> <span>{{coding.code}}</span>
-                                    </p>
-                                {% endif %}
-                                {% if coding.display.exists() %}
-                                    <p style="margin-bottom: 5px;">
-                                        <b>display: </b> <span>{{coding.display.escape('html')}}</span>
-                                    </p>
-                                {% endif %}
-                            {% endfor %}
-                        {% endif %}
-                        {% if Measure.subject.coding.exists().not and Measure.subject.text.exists() %}
-                            {{Measure.subject.text}}
-                        {% endif %}
-                    </td>
+        <tr>
+            <th scope="row"><b>Subject: </b></th>
+            {%if Measure.subject is CodeableConcept %}
+            <td style="padding-left: 4px;">
+                {% if Measure.subject.coding.exists() %}
+                {% for coding in Measure.subject.coding %}
+                {% if coding.system.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>system: </b> <span>{{coding.system}}</span>
+                </p>
                 {% endif %}
-                {% if Measure.subject is Reference %}
-                    <td style="padding-left: 4px;">
-                        {% if Measure.subject.reference.exists() %}
-                            <p style="margin-bottom: 5px;">
-                                <b>reference: </b> <span>{{Measure.subject.reference}}</span>
-                            </p>
-                        {% endif %}
-                        {% if Measure.subject.type.exists() %}
-                            <p style="margin-bottom: 5px;">
-                                <b>type: </b> <span>{{Measure.subject.type}}</span>
-                            </p>
-                        {% endif %}
-                        {% if Measure.subject.display.exists() %}
-                            <p style="margin-bottom: 5px;">
-                                <b>code: </b> <span>{{Measure.subject.display.escape('html')}}</span>
-                            </p>
-                        {% endif %}
-                    </td>
+                {% if coding.code.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>code: </b> <span>{{coding.code}}</span>
+                </p>
+                {% endif %}
+                {% if coding.display.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>display: </b> <span>{{coding.display.escape('html')}}</span>
+                </p>
+                {% endif %}
+                {% endfor %}
+                {% endif %}
+                {% if Measure.subject.coding.exists().not and Measure.subject.text.exists() %}
+                {{Measure.subject.text}}
                 {% endif %}
-            </tr>
+            </td>
+            {% endif %}
+            {% if Measure.subject is Reference %}
+            <td style="padding-left: 4px;">
+                {% if Measure.subject.reference.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>reference: </b> <span>{{Measure.subject.reference}}</span>
+                </p>
+                {% endif %}
+                {% if Measure.subject.type.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>type: </b> <span>{{Measure.subject.type}}</span>
+                </p>
+                {% endif %}
+                {% if Measure.subject.display.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>code: </b> <span>{{Measure.subject.display.escape('html')}}</span>
+                </p>
+                {% endif %}
+            </td>
+            {% endif %}
+        </tr>
         {% endif %}
         {% if Measure.date.exists() %}
-            <tr>
-                <th scope="row"><b>Date: </b></th>
-                <td style="padding-left: 4px;">{{Measure.date}}</td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Date: </b></th>
+            <td style="padding-left: 4px;">{{Measure.date}}</td>
+        </tr>
         {% endif %}
         {% if Measure.publisher.exists() %}
-            <tr>
-                <th scope="row"><b>Publisher: </b></th>
-                <td style="padding-left: 4px;">{{Measure.publisher.escape('html')}}</td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Publisher: </b></th>
+            <td style="padding-left: 4px;">{{Measure.publisher.escape('html')}}</td>
+        </tr>
         {% endif %}
         {% if Measure.description.exists() %}
-            <tr>
-                <th scope="row"><b>Description: </b></th>
-                <td style="padding-left: 4px;">{{Measure.description.escape('html')}}</td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Description: </b></th>
+            <td style="padding-left: 4px;">{{Measure.description.escape('html')}}</td>
+        </tr>
         {% endif %}
         {% if Measure.group.exists() %}
-            {% if Measure.group[0].population.description.exists() %}
-                <tr>
-                    <th scope="row"><b>Population Criteria: </b></th>
-                    <td style="padding-left: 4px;">
-                        {% for group in Measure.group %}
-                            <table class="grid-dict">
-                                {% if group.id.exists() %}
-                                    <tr>
-                                        <th><b>{{group.id}}</b></th>
-                                    </tr>
-                                {% endif %}
-                                {% for population in group.population %}
-                                    <tr>
-                                        <td>{{population.code.coding[0].display}}: </td>
-                                        <td>{{population.description}}</td>
-                                    </tr>
-                                {% endfor %}
-                            </table>
-                        {% endfor %}
-                    </td>
-                </tr>
-            {% endif %}
-        {% endif %}
-        {% if Measure.extension.where(url = 'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability').exists() %}
-            <tr>
-                <th scope="row"><b>Knowledge Capability: </b></th>
-                <td style="padding-left: 4px;">
-                    {% for extension in Measure.extension.where(url = 'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability') %}{{extension.value}} {% endfor %}
-                </td>
-            </tr>
-        {% endif %}
-        {% if Measure.extension.where(url = 'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeRepresentationLevel').exists() %}
-            <tr>
-                <th scope="row"><b>Knowledge Representation Level: </b></th>
-                <td style="padding-left: 4px;">
-                    {% for extension in Measure.extension.where(url = 'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeRepresentationLevel') %}{{extension.value}}{% endfor %}
-                </td>
-            </tr>
-        {% endif %}
-        {% if Measure.extension.where(url = 'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-effectiveDataRequirements').exists() %}
-            {% for contained in Measure.contained.where(id = 'effective-data-requirements') %}
-                <tr>
-                    <th scope="row"><b>Related Artifact Dependencies: </b></th>
-                    <td style="padding-left: 4px;">
-                        {% for relatedArtifact in contained.relatedArtifact.where(type= 'depends-on') %}
-                            <li>{{relatedArtifact.resource}}</li>
-                        {% endfor %}
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row"><b>Parameters:</b></th>
-                    <td style="padding-left: 4px;">
-                        <table class="grid-dict">
-                            <tr><th><b>name</b></th><th><b>use</b></th><th><b>min</b></th><th><b>max</b></th><th><b>type</b></th></tr>
-                            {% for parameter in contained.parameter %}
-                                <tr>
-                                    <td>{{parameter.name}}</td>
-                                    <td>{{parameter.use}}</td>
-                                    <td>{{parameter.min}}</td>
-                                    <td>{{parameter.max}}</td>
-                                    <td>{{parameter.type}}</td>
-                                </tr>
+        {% if Measure.group[0].population.description.exists() %}
+        <tr>
+            <th scope="row"><b>Population Criteria: </b></th>
+            <td style="padding-left: 4px;">
+                {% for group in Measure.group %}
+                <table class="grid-dict">
+                    {% if group.id.exists() %}
+                    <tr>
+                        <th><b>{{group.id}}</b></th>
+                    </tr>
+                    {% endif %}
+                    {% for population in group.population %}
+                    <tr>
+                        <td>{{population.code.coding[0].display}}: </td>
+                        <td>{{population.description}}</td>
+                    </tr>
+                    {% endfor %}
+                </table>
+                {% endfor %}
+            </td>
+        </tr>
+        {% endif %}
+        {% endif %}
+        {% if Measure.extension.where(url =
+        'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability').exists() %}
+        <tr>
+            <th scope="row"><b>Knowledge Capability: </b></th>
+            <td style="padding-left: 4px;">
+                {% for extension in Measure.extension.where(url =
+                'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability') %}{{extension.value}} {%
+                endfor %}
+            </td>
+        </tr>
+        {% endif %}
+        {% if Measure.extension.where(url =
+        'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeRepresentationLevel').exists() %}
+        <tr>
+            <th scope="row"><b>Knowledge Representation Level: </b></th>
+            <td style="padding-left: 4px;">
+                {% for extension in Measure.extension.where(url =
+                'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeRepresentationLevel')
+                %}{{extension.value}}{% endfor %}
+            </td>
+        </tr>
+        {% endif %}
+        {% if Measure.extension.where(url =
+        'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-effectiveDataRequirements').exists() %}
+        {% for contained in Measure.contained.where(id = 'effective-data-requirements') %}
+        <tr>
+            <th scope="row"><b>Related Artifact Dependencies: </b></th>
+            <td style="padding-left: 4px;">
+                <table class="grid-dict">
+                    <tr>
+                        <th><b>Display</b></th>
+                        <th><b>Resource Identifier &amp; Version</b></th>
+                    </tr>
+                    {% for relatedArtifact in contained.relatedArtifact.where(type= 'depends-on') %}
+                    <tr>
+                        <td>
+                            {{relatedArtifact.display}}
+                        </td>
+                        <td>
+                            <a href="{{relatedArtifact.resource}}">{{relatedArtifact.resource}}</a>
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </table>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><b>Parameters:</b></th>
+            <td style="padding-left: 4px;">
+                <table class="grid-dict">
+                    <tr>
+                        <th><b>name</b></th>
+                        <th><b>use</b></th>
+                        <th><b>min</b></th>
+                        <th><b>max</b></th>
+                        <th><b>type</b></th>
+                    </tr>
+                    {% for parameter in contained.parameter %}
+                    <tr>
+                        <td>{{parameter.name}}</td>
+                        <td>{{parameter.use}}</td>
+                        <td>{{parameter.min}}</td>
+                        <td>{{parameter.max}}</td>
+                        <td>{{parameter.type}}</td>
+                    </tr>
+                    {% endfor %}
+                </table>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><b>DataRequirements:</b></th>
+            <td style="padding-left: 4px;">
+                <table class="grid-dict">
+                    <tr>
+                        <th><b>Type</b></th>
+                        <th><b>Must Support</b></th>
+                        <th><b>Valueset Name</b></th>
+                        <th><b>Valueset</b></th>
+                    </tr>
+                    {% for dataRequirement in contained.dataRequirement %}
+                    <tr>
+                        <td>{{dataRequirement.type}}</td>
+                        <td>
+                            {% for mustSupport in dataRequirement.mustSupport %}
+                            {{ mustSupport }}
                             {% endfor %}
-                        </table>
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row"><b>DataRequirements:</b></th>
-                    <td style="padding-left: 4px;">
-                        <table class="grid-dict">
-                            <tr><th><b>Type</b></th><th><b>Must Support</b></th><th><b>Valueset Name</b></th><th><b>Valueset</b></th></tr>
-                            {% for dataRequirement in contained.dataRequirement %}
-                                <tr>
-                                    <td>{{dataRequirement.type}}</td>
-                                    <td>
-                                        {% for mustSupport in dataRequirement.mustSupport %}
-                                            {{ mustSupport }}
-                                        {% endfor %}
-                                    </td>
-                                    <td>
-                                        {% for relatedArtifact in contained.relatedArtifact.where(resource = dataRequirement.codeFilter.first().valueSet) %}
-                                            {%  if relatedArtifact.display.startsWith("Value set ") %}
-                                                {{ relatedArtifact.display.substring(9).replace(' &', ',') }}
-                                            {% else %}
-                                                {{ relatedArtifact.display.replace(' &', ',') }}
-                                            {%  endif %}
-                                        {% endfor %}
-                                    </td>
-                                    <td>{{dataRequirement.codeFilter.first().valueSet}}</td>
-                                </tr>
+                        </td>
+                        <td>
+                            {% for relatedArtifact in contained.relatedArtifact.where(resource =
+                            dataRequirement.codeFilter.first().valueSet) %}
+                            {% if relatedArtifact.display.startsWith("Value set ") %}
+                            {{ relatedArtifact.display.substring(9).replace(' &', ',') }}
+                            {% else %}
+                            {{ relatedArtifact.display.replace(' &', ',') }}
+                            {% endif %}
                             {% endfor %}
-                        </table>
-                    </td>
-                </tr>
-                {% if contained.extension.where(url = 'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-directReferenceCode').exists() %}
-                    <tr>
-                        <th scope="row"><b>Direct Reference Codes:</b></th>
-                        <td style="padding-left: 4px;">
-                            <table class="grid-dict">
-                                <tr><th><b>display</b></th><th><b>code</b></th><th><b>system</b></th></tr>
-                                {% for extension in contained.extension.where(url = 'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-directReferenceCode') %}
-                                    <tr>
-                                        <td>{{extension.valueCoding.display.escape('html')}}</td>
-                                        <td>{{extension.valueCoding.code}}</td>
-                                        <td>{{extension.valueCoding.version}}</td>
-                                    </tr>
-                                {% endfor %}
-                            </table>
                         </td>
+                        <td>{{dataRequirement.codeFilter.first().valueSet}}</td>
                     </tr>
-                {% endif %}
-                {% if contained.extension.where(url = 'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-logicDefinition').exists() %}
-                    <tr>
-                        <th scope="row"><b>Logic Definitions:</b></th>
-                        <td style="padding-left: 4px;">
-                            <table class="grid-dict">
-                                {% for extension in contained.extension.where(url = 'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-logicDefinition') %}
-                                    <tr><th><b>Library Name</b></th><th><b>Name</b></th><th><b>sequence</b></th></tr>
-                                    <tr>
-                                        {% for lNameExtension in extension.extension.where(url = 'libraryName') %}
-                                            <td>{{lNameExtension.value}}</td>
-                                        {% endfor %}
-                                        {% for nameExtension in extension.extension.where(url = 'name') %}
-                                            <td>{{nameExtension.value}}</td>
-                                        {% endfor %}
-                                        {% if extension.extension.where(url = 'displaySequence').exists() %}
-                                            {% for sequenceExtension in extension.extension.where(url = 'displaySequence') %}
-                                                <td>{{sequenceExtension.value}}{{nameExtension.value}}</td>
-                                            {% endfor %}
-                                        {% else %}<td></td>
-                                        {% endif %}
-                                    </tr>
-                                    <tr>
-                                        {% for statementExtension in extension.extension.where(url = 'statement') %}
-                                            <td></td>
-                                        <td><pre class="highlight language-cql"><code data-lang="cql"  class="language-cql">{{statementExtension.value.escape('html')}}</code></pre></td>
-                                        {% endfor %}
-                                    </tr>
-                                {% endfor %}
-                            </table>
+                    {% endfor %}
+                </table>
+            </td>
+        </tr>
+        {% if contained.extension.where(url =
+        'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-directReferenceCode').exists() %}
+        <tr>
+            <th scope="row"><b>Direct Reference Codes:</b></th>
+            <td style="padding-left: 4px;">
+                <table class="grid-dict">
+                    <tr>
+                        <th><b>display</b></th>
+                        <th><b>code</b></th>
+                        <th><b>system</b></th>
+                    </tr>
+                    {% for extension in contained.extension.where(url =
+                    'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-directReferenceCode') %}
+                    <tr>
+                        <td>{{extension.valueCoding.display.escape('html')}}</td>
+                        <td>{{extension.valueCoding.code}}</td>
+                        <td>{{extension.valueCoding.version}}</td>
+                    </tr>
+                    {% endfor %}
+                </table>
+            </td>
+        </tr>
+        {% endif %}
+        {% if contained.extension.where(url =
+        'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-logicDefinition').exists() %}
+        <tr>
+            <th scope="row"><b>Logic Definitions:</b></th>
+            <td style="padding-left: 4px;">
+                <table class="grid-dict">
+                    {% for extension in contained.extension.where(url =
+                    'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-logicDefinition') %}
+                    <tr>
+                        <th><b>Library Name</b></th>
+                        <th><b>Name</b></th>
+                        <th><b>sequence</b></th>
+                    </tr>
+                    <tr>
+                        {% for lNameExtension in extension.extension.where(url = 'libraryName') %}
+                        <td>{{lNameExtension.value}}</td>
+                        {% endfor %}
+                        {% for nameExtension in extension.extension.where(url = 'name') %}
+                        <td>{{nameExtension.value}}</td>
+                        {% endfor %}
+                        {% if extension.extension.where(url = 'displaySequence').exists() %}
+                        {% for sequenceExtension in extension.extension.where(url = 'displaySequence') %}
+                        <td>{{sequenceExtension.value}}{{nameExtension.value}}</td>
+                        {% endfor %}
+                        {% else %}<td></td>
+                        {% endif %}
+                    </tr>
+                    <tr>
+                        {% for statementExtension in extension.extension.where(url = 'statement') %}
+                        <td></td>
+                        <td>
+                            <pre
+                                class="highlight language-cql"><code data-lang="cql"  class="language-cql">{{statementExtension.value.escape('html')}}</code></pre>
                         </td>
+                        {% endfor %}
                     </tr>
-                {% endif %}
-            {% endfor %}
+                    {% endfor %}
+                </table>
+            </td>
+        </tr>
+        {% endif %}
+        {% endfor %}
         {% else %}
-            {% if Measure.extension.where(url = 'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-dataRequirement').exists() %}
-                {% if Measure.extension.where(url = 'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-parameter').exists() %}
-                    <tr>
-                        <th scope="row"><b>Parameters: </b></th>
-                        <td style="padding-left: 4px;">
-                            <table class="grid-dict">
-                                <tr><th><b>name</b></th><th><b>use</b></th><th><b>min</b></th><th><b>max</b></th><th><b>type</b></th></tr>
-                                {% for extension in Measure.extension.where(url = 'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-parameter') %}
-                                    <tr>
-                                        <td>{{extension.valueParameterDefinition.name}}</td>
-                                        <td>{{extension.valueParameterDefinition.use}}</td>
-                                        <td>{{extension.valueParameterDefinition.min}}</td>
-                                        <td>{{extension.valueParameterDefinition.max}}</td>
-                                        <td>{{extension.valueParameterDefinition.type}}</td>
-                                    </tr>
-                                {% endfor %}
-                            </table>
-                        </td>
+        {% if Measure.extension.where(url =
+        'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-dataRequirement').exists() %}
+        {% if Measure.extension.where(url =
+        'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-parameter').exists() %}
+        <tr>
+            <th scope="row"><b>Parameters: </b></th>
+            <td style="padding-left: 4px;">
+                <table class="grid-dict">
+                    <tr>
+                        <th><b>name</b></th>
+                        <th><b>use</b></th>
+                        <th><b>min</b></th>
+                        <th><b>max</b></th>
+                        <th><b>type</b></th>
                     </tr>
-                {% endif %}
-                {% if Measure.extension.where(url = 'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-dataRequirement').exists() %}
-                    <tr>
-                        <th scope="row"><b>Data Requirements: </b></th>
-                        <td style="padding-left: 4px;">
-                            <table class="grid-dict">
-                                <tr><th><b>type</b></th><th><b>path</b></th><th><b>valueSet or system</b></th><th><b>code</b></th></tr>
-                                {% for extension in Measure.extension.where(url = 'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-dataRequirement') %}
-                                    <tr>
-                                        <td>{{extension.valueDataRequirement.type}}</td>
-                                        <td>{{extension.valueDataRequirement.codeFilter.first().path}}</td>
-                                        {% if extension.valueDataRequirement.codeFilter.first().valueSet.exists() %}
-                                            <td>{{extension.valueDataRequirement.codeFilter.first().valueSet}}</td>
-                                            <td></td>
-                                        {% endif%}
-                                        {% if extension.valueDataRequirement.codeFilter.first().code.exists() %}
-                                            <td>{{extension.valueDataRequirement.codeFilter.first().code.first().version}}</td>
-                                            <td>{{extension.valueDataRequirement.codeFilter.first().code.first().code}}</td>
-                                        {% endif%}
-                                    </tr>
-                                {% endfor %}
-                            </table>
-                        </td>
+                    {% for extension in Measure.extension.where(url =
+                    'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-parameter') %}
+                    <tr>
+                        <td>{{extension.valueParameterDefinition.name}}</td>
+                        <td>{{extension.valueParameterDefinition.use}}</td>
+                        <td>{{extension.valueParameterDefinition.min}}</td>
+                        <td>{{extension.valueParameterDefinition.max}}</td>
+                        <td>{{extension.valueParameterDefinition.type}}</td>
                     </tr>
-                {% endif %}
-                {% if Measure.extension.where(url = 'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-directReferenceCode').exists() %}
-                    <tr>
-                        <th scope="row"><b>Direct Reference Codes: </b></th>
-                        <td style="padding-left: 4px;">
-                            <table class="grid-dict">
-                                <tr><th><b>display</b></th><th><b>code</b></th><th><b>system</b></th></tr>
-                                {% for extension in Measure.extension.where(url = 'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-directReferenceCode') %}
-                                    <tr>
-                                        <td>{{extension.valueCoding.display.escape('html')}}</td>
-                                        <td>{{extension.valueCoding.code}}</td>
-                                        <td>{{extension.valueCoding.version}}</td>
-                                    </tr>
-                                {% endfor %}
-                            </table>
-                        </td>
+                    {% endfor %}
+                </table>
+            </td>
+        </tr>
+        {% endif %}
+        {% if Measure.extension.where(url =
+        'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-dataRequirement').exists() %}
+        <tr>
+            <th scope="row"><b>Data Requirements: </b></th>
+            <td style="padding-left: 4px;">
+                <table class="grid-dict">
+                    <tr>
+                        <th><b>type</b></th>
+                        <th><b>path</b></th>
+                        <th><b>valueSet or system</b></th>
+                        <th><b>code</b></th>
                     </tr>
-                {% endif %}
-                {% if Measure.extension.where(url = 'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-logicDefinition').exists() %}
-                    <tr>
-                        <th scope="row"><b>Logic Definitions: </b></th>
-                        <td style="padding-left: 4px;">
-                            {% for extension in Measure.extension.where(url = 'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-logicDefinition') %}
-                                <table class="grid-dict">
-                                    <tr><th><b>Library Name</b></th><th><b>Name</b></th><th><b>sequence</b></th></tr>
-                                    <tr>
-                                        {% for lNameExtension in extension.extension.where(url = 'libraryName') %}
-                                            <td>{{lNameExtension.value}}</td>
-                                        {% endfor %}
-                                        {% for nameExtension in extension.extension.where(url = 'name') %}
-                                            <td>{{nameExtension.value}}</td>
-                                        {% endfor %}
-                                        {% for sequenceExtension in extension.extension.where(url = 'sequence') %}
-                                            <td>{{sequenceExtension.value}}</td>
-                                        {% endfor %}
-                                    </tr>
-                                </table>
-                                {% for statementExtension in extension.extension.where(url = 'statement') %}
-                                    <pre class="highlight language-cql"><code data-lang="cql" class="language-cql">{{statementExtension.value.escape('html')}}</code></pre>
-                                {% endfor %}
-                                <br/><br/>
-                            {% endfor %}
-                        </td>
+                    {% for extension in Measure.extension.where(url =
+                    'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-dataRequirement') %}
+                    <tr>
+                        <td>{{extension.valueDataRequirement.type}}</td>
+                        <td>{{extension.valueDataRequirement.codeFilter.first().path}}</td>
+                        {% if extension.valueDataRequirement.codeFilter.first().valueSet.exists() %}
+                        <td>{{extension.valueDataRequirement.codeFilter.first().valueSet}}</td>
+                        <td></td>
+                        {% endif%}
+                        {% if extension.valueDataRequirement.codeFilter.first().code.exists() %}
+                        <td>{{extension.valueDataRequirement.codeFilter.first().code.first().version}}</td>
+                        <td>{{extension.valueDataRequirement.codeFilter.first().code.first().code}}</td>
+                        {% endif%}
                     </tr>
-                {% endif %}
-            {% endif %}
+                    {% endfor %}
+                </table>
+            </td>
+        </tr>
+        {% endif %}
+        {% if Measure.extension.where(url =
+        'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-directReferenceCode').exists() %}
+        <tr>
+            <th scope="row"><b>Direct Reference Codes: </b></th>
+            <td style="padding-left: 4px;">
+                <table class="grid-dict">
+                    <tr>
+                        <th><b>display</b></th>
+                        <th><b>code</b></th>
+                        <th><b>system</b></th>
+                    </tr>
+                    {% for extension in Measure.extension.where(url =
+                    'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-directReferenceCode') %}
+                    <tr>
+                        <td>{{extension.valueCoding.display.escape('html')}}</td>
+                        <td>{{extension.valueCoding.code}}</td>
+                        <td>{{extension.valueCoding.version}}</td>
+                    </tr>
+                    {% endfor %}
+                </table>
+            </td>
+        </tr>
+        {% endif %}
+        {% if Measure.extension.where(url =
+        'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-logicDefinition').exists() %}
+        <tr>
+            <th scope="row"><b>Logic Definitions: </b></th>
+            <td style="padding-left: 4px;">
+                {% for extension in Measure.extension.where(url =
+                'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-logicDefinition') %}
+                <table class="grid-dict">
+                    <tr>
+                        <th><b>Library Name</b></th>
+                        <th><b>Name</b></th>
+                        <th><b>sequence</b></th>
+                    </tr>
+                    <tr>
+                        {% for lNameExtension in extension.extension.where(url = 'libraryName') %}
+                        <td>{{lNameExtension.value}}</td>
+                        {% endfor %}
+                        {% for nameExtension in extension.extension.where(url = 'name') %}
+                        <td>{{nameExtension.value}}</td>
+                        {% endfor %}
+                        {% for sequenceExtension in extension.extension.where(url = 'sequence') %}
+                        <td>{{sequenceExtension.value}}</td>
+                        {% endfor %}
+                    </tr>
+                </table>
+                {% for statementExtension in extension.extension.where(url = 'statement') %}
+                <pre
+                    class="highlight language-cql"><code data-lang="cql" class="language-cql">{{statementExtension.value.escape('html')}}</code></pre>
+                {% endfor %}
+                <br /><br />
+                {% endfor %}
+            </td>
+        </tr>
+        {% endif %}
+        {% endif %}
         {% endif %}
         {% if Measure.supplementalData.exists() %}
-            <tr>
-                <th scope="row"><b>Supplemental Data: </b></th>
-                <td style="padding-left: 4px;">
-                    <table class="grid-dict">
-                        <tr><th><b>expression</b></th><th><b>system</b></th></tr>
-                        {% for supplementalData in Measure.supplementalData %}
-                            <tr>
-                                <td>{{supplementalData.criteria.expression}}</td>
-                                <td>{{(supplementalData.usage.first() as CodeableConcept).coding.first().system}}</td>
-                            </tr>
-                        {% endfor %}
-                    </table>
-                </td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Supplemental Data: </b></th>
+            <td style="padding-left: 4px;">
+                <table class="grid-dict">
+                    <tr>
+                        <th><b>expression</b></th>
+                        <th><b>system</b></th>
+                    </tr>
+                    {% for supplementalData in Measure.supplementalData %}
+                    <tr>
+                        <td>{{supplementalData.criteria.expression}}</td>
+                        <td>{{(supplementalData.usage.first() as CodeableConcept).coding.first().system}}</td>
+                    </tr>
+                    {% endfor %}
+                </table>
+            </td>
+        </tr>
         {% endif %}
         {% if Measure.useContext.exists() %}
-            <tr>
-                <th scope="row"><b>Use Context: </b></th>
-                <td style="padding-left: 4px;">
-                    <table class="grid-dict">
-                        <tr><th><b>code</b></th><th><b>value</b></th></tr>
-                        {% for useContext in Measure.useContext %}
-                            <tr>
-                                <td>{{useContext.code.code}}</td>
-                                <td>{{(useContext.valueCodeableConcept).text}}</td>
-                            </tr>
-                        {% endfor %}
-                    </table>
-                </td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Use Context: </b></th>
+            <td style="padding-left: 4px;">
+                <table class="grid-dict">
+                    <tr>
+                        <th><b>code</b></th>
+                        <th><b>value</b></th>
+                    </tr>
+                    {% for useContext in Measure.useContext %}
+                    <tr>
+                        <td>{{useContext.code.code}}</td>
+                        <td>{{(useContext.valueCodeableConcept).text}}</td>
+                    </tr>
+                    {% endfor %}
+                </table>
+            </td>
+        </tr>
         {% endif %}
         {% if Measure.jurisdiction.exists() %}
-            <tr>
-                <th scope="row"><b>Jurisdiction: </b></th>
-                <td style="padding-left: 25px;">{{Measure.jurisdiction.first().coding.first().code}}</td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Jurisdiction: </b></th>
+            <td style="padding-left: 25px;">{{Measure.jurisdiction.first().coding.first().code}}</td>
+        </tr>
         {% endif %}
         {% if Measure.topic.exists() %}
-            <tr>
-                <th scope="row"><b>Topic: </b></th>
-                <td style="padding-left: 25px;">{{Measure.topic.first().coding.first().code}}</td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Topic: </b></th>
+            <td style="padding-left: 25px;">{{Measure.topic.first().coding.first().code}}</td>
+        </tr>
         {% endif %}
         {% if Measure.purpose.exists() %}
-            <tr>
-                <th scope="row"><b>Purpose: </b></th>
-                <td style="padding-left: 4px;">{{Measure.purpose.escape('html')}}</td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Purpose: </b></th>
+            <td style="padding-left: 4px;">{{Measure.purpose.escape('html')}}</td>
+        </tr>
         {% endif %}
         {% if Measure.usage.exists() %}
-            <tr>
-                <th scope="row"><b>Usage: </b></th>
-                <td style="padding-left: 4px;">{{Measure.usage.escape('html')}}</td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Usage: </b></th>
+            <td style="padding-left: 4px;">{{Measure.usage.escape('html')}}</td>
+        </tr>
         {% endif %}
         {% if Measure.copyright.exists() %}
-            <tr>
-                <th scope="row"><b>Copyright: </b></th>
-                <td style="padding-left: 25px;">{{Measure.copyright.escape('html')}}</td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Copyright: </b></th>
+            <td style="padding-left: 25px;">{{Measure.copyright.escape('html')}}</td>
+        </tr>
         {% endif %}
         {% if Measure.disclaimer.exists() %}
-            <tr>
-                <th scope="row"><b>Disclaimer: </b></th>
-                <td style="padding-left: 25px;">{{Measure.disclaimer.escape('html')}}</td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Disclaimer: </b></th>
+            <td style="padding-left: 25px;">{{Measure.disclaimer.escape('html')}}</td>
+        </tr>
         {% endif %}
         {% if Measure.approvalDate.exists() %}
-            <tr>
-                <th scope="row"><b>Approval Date: </b></th>
-                <td style="padding-left: 4px;">{{Measure.approvalDate}}</td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Approval Date: </b></th>
+            <td style="padding-left: 4px;">{{Measure.approvalDate}}</td>
+        </tr>
         {% endif %}
         {% if Measure.lastReviewDate.exists() %}
-            <tr>
-                <th scope="row"><b>Last Review Date: </b></th>
-                <td style="padding-left: 4px;">{{Measure.lastReviewDate}}</td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Last Review Date: </b></th>
+            <td style="padding-left: 4px;">{{Measure.lastReviewDate}}</td>
+        </tr>
         {% endif %}
         {% if Measure.effectivePeriod.exists() %}
-            <tr>
-                <th scope="row"><b>Effective Period: </b></th>
-                <td style="padding-left: 4px;">{{Measure.effectivePeriod.start}}..{{Measure.effectivePeriod.end}}</td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Effective Period: </b></th>
+            <td style="padding-left: 4px;">{{Measure.effectivePeriod.start}}..{{Measure.effectivePeriod.end}}</td>
+        </tr>
         {% endif %}
         {% if Measure.relatedArtifact.exists() %}
-            <tr>
-                <th scope="row"><b>Related Artifacts: </b></th>
-                <td style="padding-left: 4px;">
-                    {% if Measure.relatedArtifact.where(type = 'documentation' or type = 'justification').exists() %}
-                        <p><b>Documentation</b></p>
-                        <ul>
-                            {% for artifact in Measure.relatedArtifact.where(type = 'documentation' or type = 'justification') %}
-                                <li><a href="{{artifact.url}}">{{artifact.label}} {{artifact.display.escape('html')}}</a></li>
-                            {% endfor %}
-                        </ul>
-                    {% endif %}
-                    {% if Measure.relatedArtifact.where(type = 'citation').exists() %}
-                        <p><b>References</b></p>
-                        <ul>
-                            {% for artifact in Measure.relatedArtifact.where(type = 'citation') %}
-                                <li>{{artifact.citation}}<br/><a href="{{artifact.url}}">{{artifact.url}}</a></li>
-                            {% endfor %}
-                        </ul>
-                    {% endif %}
-                    {% if Measure.relatedArtifact.where(type = 'depends-on').exists() and
-                            Measure.extension.where(url = 'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-effectiveDataRequirements').exists().not  %}
-                        <p><b>Dependencies</b></p>
-                        <ul>
-                            {% for artifact in Measure.relatedArtifact.where(type = 'depends-on') %}
-                                <li>{{artifact.resource}}</li>
-                            {% endfor %}
-                        </ul>
-                    {% endif %}
-                    {% if Measure.relatedArtifact.where(type = 'composed-of').exists() %}
-                        <p><b>Components</b></p>
-                        <ul>
-                            {% for artifact in Measure.relatedArtifact.where(type = 'composed-of') %}
-                                <li>{{artifact.resource}}</li>
-                            {% endfor %}
-                        </ul>
-                    {% endif %}
-                    {% if Measure.relatedArtifact.where(type = 'derived-from').exists() %}
-                        <p><b>Derived From</b></p>
-                        <ul>
-                            {% for artifact in Measure.relatedArtifact.where(type = 'derived-from') %}
-                                <li>{{artifact.resource}}</li>
-                            {% endfor %}
-                        </ul>
-                    {% endif %}
-                    {% if Measure.relatedArtifact.where(type = 'successor').exists() %}
-                        <p><b>Successor</b></p>
-                        <ul>
-                            {% for artifact in Measure.relatedArtifact.where(type = 'successor') %}
-                                <li>{{artifact.resource}}</li>
-                            {% endfor %}
-                        </ul>
-                    {% endif %}
-                    {% if Measure.relatedArtifact.where(type = 'predecessor').exists() %}
-                        <p><b>Predecessor</b></p>
-                        <ul>
-                            {% for artifact in Measure.relatedArtifact.where(type = 'predecessor') %}
-                                <li>{{artifact.resource}}</li>
-                            {% endfor %}
-                        </ul>
-                    {% endif %}
-                </td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Related Artifacts: </b></th>
+            <td style="padding-left: 4px;">
+                {% if Measure.relatedArtifact.where(type = 'documentation' or type = 'justification').exists() %}
+                <p><b>Documentation</b></p>
+                <ul>
+                    {% for artifact in Measure.relatedArtifact.where(type = 'documentation' or type = 'justification')
+                    %}
+                    <li><a href="{{artifact.url}}">{{artifact.label}} {{artifact.display.escape('html')}}</a></li>
+                    {% endfor %}
+                </ul>
+                {% endif %}
+                {% if Measure.relatedArtifact.where(type = 'citation').exists() %}
+                <p><b>References</b></p>
+                <ul>
+                    {% for artifact in Measure.relatedArtifact.where(type = 'citation') %}
+                    <li>{{artifact.citation}}<br /><a href="{{artifact.url}}">{{artifact.url}}</a></li>
+                    {% endfor %}
+                </ul>
+                {% endif %}
+                {% if Measure.relatedArtifact.where(type = 'depends-on').exists() and
+                Measure.extension.where(url =
+                'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-effectiveDataRequirements').exists().not %}
+                <p><b>Dependencies</b></p>
+                <table class="grid-dict">
+                    <tr>
+                        <th><b>Display</b></th>
+                        <th><b>Resource Identifier &amp; Version</b></th>
+                    </tr>
+                    {% for artifact in Measure.relatedArtifact.where(type = 'depends-on') %}
+                    <tr>
+                        <td>
+                            {{artifact.display}}
+                        </td>
+                        <td>
+                            <a href="{{artifact.resource}}">{{artifact.resource}}</a>
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </table>
+                {% endif %}
+                {% if Measure.relatedArtifact.where(type = 'composed-of').exists() %}
+                <p><b>Components</b></p>
+                <ul>
+                    {% for artifact in Measure.relatedArtifact.where(type = 'composed-of') %}
+                    <li>{{artifact.resource}}</li>
+                    {% endfor %}
+                </ul>
+                {% endif %}
+                {% if Measure.relatedArtifact.where(type = 'derived-from').exists() %}
+                <p><b>Derived From</b></p>
+                <ul>
+                    {% for artifact in Measure.relatedArtifact.where(type = 'derived-from') %}
+                    <li>{{artifact.resource}}</li>
+                    {% endfor %}
+                </ul>
+                {% endif %}
+                {% if Measure.relatedArtifact.where(type = 'successor').exists() %}
+                <p><b>Successor</b></p>
+                <ul>
+                    {% for artifact in Measure.relatedArtifact.where(type = 'successor') %}
+                    <li>{{artifact.resource}}</li>
+                    {% endfor %}
+                </ul>
+                {% endif %}
+                {% if Measure.relatedArtifact.where(type = 'predecessor').exists() %}
+                <p><b>Predecessor</b></p>
+                <ul>
+                    {% for artifact in Measure.relatedArtifact.where(type = 'predecessor') %}
+                    <li>{{artifact.resource}}</li>
+                    {% endfor %}
+                </ul>
+                {% endif %}
+            </td>
+        </tr>
         {% endif %}
         {% if Measure.parameter.exists() %}
-            <tr>
-                <th scope="row"><b>Parameters: </b></th>
-                <td style="padding-left: 4px;">
-                    <table class="grid-dict">
-                        <tr><th><b>Name</b></th><th><b>Type</b></th><th><b>Min</b></th><th><b>Max</b></th><th><b>In/Out</b></th></tr>
-                        {% for param in Measure.parameter %}
-                            <tr><th>{{param.name}}</th><th>{{param.type}}</th><th>{{param.min}}</th><th>{{param.max}}</th><th>{{param.use}}</th></tr>
-                        {% endfor %}
-                    </table>
-                </td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Parameters: </b></th>
+            <td style="padding-left: 4px;">
+                <table class="grid-dict">
+                    <tr>
+                        <th><b>Name</b></th>
+                        <th><b>Type</b></th>
+                        <th><b>Min</b></th>
+                        <th><b>Max</b></th>
+                        <th><b>In/Out</b></th>
+                    </tr>
+                    {% for param in Measure.parameter %}
+                    <tr>
+                        <th>{{param.name}}</th>
+                        <th>{{param.type}}</th>
+                        <th>{{param.min}}</th>
+                        <th>{{param.max}}</th>
+                        <th>{{param.use}}</th>
+                    </tr>
+                    {% endfor %}
+                </table>
+            </td>
+        </tr>
         {% endif %}
         {% if Measure.dataRequirement.exists() %}
-            <tr>
-                <th scope="row"><b>Data Requirements:</b></th>
-                <td style="padding-left: 4px;">
-                    <table class="grid-dict">
-                        <tr><th><b>Type</b></th><th><b>Profile</b></th><th><b>MS</b></th><th><b>Code Filter</b></th></tr>
-                        {% for requirement in Measure.dataRequirement %}
-                            <tr>
-                                <th>{{requirement.type.value}}</th>
-                                <th>{% for profile in requirement.profile %}{{profile.value}}{% endfor %}</th>
-                                <th>{% for support in requirement.mustSupport %}{{mustSupport}};{% endfor %}</th>
-                                <th>
-                                    {% for cfilter in requirement.codeFilter %}
-                                        <b>code filter: </b>
-                                        {% if cfilter.path.exists() or cfilter.valueSet.exists() or cfilter.code.exists() %}
-                                            <br/>
-                                        {% endif %}
-                                        {% if cfilter.path.exists() %}
-                                            <span style="padding-left: 4px;">
-                          <b>path: </b><span>{{cfilter.path}}</span>
-                      </span>
-                                            {% if cfilter.valueSet.exists() or cfilter.code.exists() %}
-                                                <br/>
-                                            {% endif %}
-                                        {% endif %}
-                                        {% if cfilter.valueSet.exists() %}
-                                            <span style="padding-left: 4px;">
-                          <b>value set: </b><span>{{cfilter.valueSet.value}}</span>
-                      </span>
-                                        {% endif %}
-                                        {% for coding in cfilter.code %}
-                                            {% if coding.system.exists() %}
-                                                <p style="margin-bottom: 5px;">
-                                                    <b>system: </b> <span>{{coding.system}}</span>
-                                                </p>
-                                            {% endif %}
-                                            {% if coding.code.exists() %}
-                                                <p style="margin-bottom: 5px;">
-                                                    <b>code: </b> <span>{{coding.code}}</span>
-                                                </p>
-                                            {% endif %}
-                                            {% if coding.display.exists() %}
-                                                <p style="margin-bottom: 5px;">
-                                                    <b>display: </b> <span>{{coding.display}}</span>
-                                                </p>
-                                            {% endif %}
-                                        {% endfor %}
-                                    {% endfor %}
-                                </th>
-                            </tr>
-                        {% endfor %}
-                    </table>
-                </td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Data Requirements:</b></th>
+            <td style="padding-left: 4px;">
+                <table class="grid-dict">
+                    <tr>
+                        <th><b>Type</b></th>
+                        <th><b>Profile</b></th>
+                        <th><b>MS</b></th>
+                        <th><b>Code Filter</b></th>
+                    </tr>
+                    {% for requirement in Measure.dataRequirement %}
+                    <tr>
+                        <th>{{requirement.type.value}}</th>
+                        <th>{% for profile in requirement.profile %}{{profile.value}}{% endfor %}</th>
+                        <th>{% for support in requirement.mustSupport %}{{mustSupport}};{% endfor %}</th>
+                        <th>
+                            {% for cfilter in requirement.codeFilter %}
+                            <b>code filter: </b>
+                            {% if cfilter.path.exists() or cfilter.valueSet.exists() or cfilter.code.exists() %}
+                            <br />
+                            {% endif %}
+                            {% if cfilter.path.exists() %}
+                            <span style="padding-left: 4px;">
+                                <b>path: </b><span>{{cfilter.path}}</span>
+                            </span>
+                            {% if cfilter.valueSet.exists() or cfilter.code.exists() %}
+                            <br />
+                            {% endif %}
+                            {% endif %}
+                            {% if cfilter.valueSet.exists() %}
+                            <span style="padding-left: 4px;">
+                                <b>value set: </b><span>{{cfilter.valueSet.value}}</span>
+                            </span>
+                            {% endif %}
+                            {% for coding in cfilter.code %}
+                            {% if coding.system.exists() %}
+                            <p style="margin-bottom: 5px;">
+                                <b>system: </b> <span>{{coding.system}}</span>
+                            </p>
+                            {% endif %}
+                            {% if coding.code.exists() %}
+                            <p style="margin-bottom: 5px;">
+                                <b>code: </b> <span>{{coding.code}}</span>
+                            </p>
+                            {% endif %}
+                            {% if coding.display.exists() %}
+                            <p style="margin-bottom: 5px;">
+                                <b>display: </b> <span>{{coding.display}}</span>
+                            </p>
+                            {% endif %}
+                            {% endfor %}
+                            {% endfor %}
+                        </th>
+                    </tr>
+                    {% endfor %}
+                </table>
+            </td>
+        </tr>
         {% endif %}
         {% for c in Measure.content %}
-            {% if c.contentType = 'text/cql' %}
-                <tr>
-                    <td colspan="2">
-                        <table>
-                            <tr><th><a id="cql-content"><b>Content: </b></a> {{c.contentType}}</th></tr>
-                            <tr><td><pre><code class="language-cql">{{c.data.decode('base64').escape('html')}}</code></pre></td></tr>
-                        </table>
-                    </td>
-                </tr>
-            {% endif %}
-            {% if c.contentType != 'text/cql' %}
-                <tr>
-                    <td colspan="2">
-                        <table>
-                            <tr><th><b>Content: </b> {{c.contentType}}</th></tr>
-                            <tr><td><pre><code>{{'Encoded data (' + c.data.length().toString() + ' characters)'}}</code></pre></td></tr>
-                        </table>
-                    </td>
-                </tr>
-            {% endif %}
+        {% if c.contentType = 'text/cql' %}
+        <tr>
+            <td colspan="2">
+                <table>
+                    <tr>
+                        <th><a id="cql-content"><b>Content: </b></a> {{c.contentType}}</th>
+                    </tr>
+                    <tr>
+                        <td>
+                            <pre><code class="language-cql">{{c.data.decode('base64').escape('html')}}</code></pre>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        {% endif %}
+        {% if c.contentType != 'text/cql' %}
+        <tr>
+            <td colspan="2">
+                <table>
+                    <tr>
+                        <th><b>Content: </b> {{c.contentType}}</th>
+                    </tr>
+                    <tr>
+                        <td>
+                            <pre><code>{{'Encoded data (' + c.data.length().toString() + ' characters)'}}</code></pre>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        {% endif %}
         {% endfor %}
         {% if Measure.library.exists() %}
-            <tr>
-                <th scope="row"><b>Libraries: </b></th>
-                <td style="padding-left: 4px;">
-                    <table class="grid-dict">
-                        {% for library in Measure.library %}
-                            <tr><td>{{library}}</td></tr>
-                        {% endfor %}
-                    </table>
-                </td>
-            </tr>
+        <tr>
+            <th scope="row"><b>Libraries: </b></th>
+            <td style="padding-left: 4px;">
+                <table class="grid-dict">
+                    {% for library in Measure.library %}
+                    <tr>
+                        <td>{{library}}</td>
+                    </tr>
+                    {% endfor %}
+                </table>
+            </td>
+        </tr>
         {% endif %}
     </table>
-</div>
+</div>
\ No newline at end of file
diff --git a/templates/liquid/PlanDefinition.liquid b/templates/liquid/PlanDefinition.liquid
index 72e1bf0..51ad236 100644
--- a/templates/liquid/PlanDefinition.liquid
+++ b/templates/liquid/PlanDefinition.liquid
@@ -1,397 +1,438 @@
 <div>
-    <table class="grid dict">
-        {% if PlanDefinition.id.exists() %}
-        <tr>
-            <th scope="row"><b>Id: </b></th>
-            <td style="padding-left: 4px;">{{PlanDefinition.id}}</td>
-        </tr>
+  <table class="grid dict">
+    {% if PlanDefinition.id.exists() %}
+    <tr>
+      <th scope="row"><b>Id: </b></th>
+      <td style="padding-left: 4px;">{{PlanDefinition.id}}</td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.url.exists() %}
+    <tr>
+      <th scope="row"><b>Url: </b></th>
+      <td style="padding-left: 4px;">{{PlanDefinition.url}}</td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.version.exists() %}
+    <tr>
+      <th scope="row"><b>Version: </b></th>
+      <td style="padding-left: 4px;">{{PlanDefinition.version}}</td>
+    </tr>
+    {% endif %}
+    {% for identifier in PlanDefinition.identifier %}
+    <tr>
+      <th scope="row"><b>Identifier: </b></th>
+      <td style="padding-left: 4px;">
+        {% if identifier.type.exists() %}
+        <p style="margin-bottom: 5px;">
+          <b>type: </b> <span>{{identifier.type.value}}</span>
+        </p>
         {% endif %}
-        {% if PlanDefinition.url.exists() %}
-        <tr>
-            <th scope="row"><b>Url: </b></th>
-            <td style="padding-left: 4px;">{{PlanDefinition.url}}</td>
-        </tr>
+        {% if identifier.value.exists() %}
+        <p style="margin-bottom: 5px;">
+          <b>value: </b> <span>{{identifier.value}}</span>
+        </p>
         {% endif %}
-        {% if PlanDefinition.version.exists() %}
-        <tr>
-            <th scope="row"><b>Version: </b></th>
-            <td style="padding-left: 4px;">{{PlanDefinition.version}}</td>
-        </tr>
+      </td>
+    </tr>
+    {% endfor %}
+    {% if PlanDefinition.name.exists() %}
+    <tr>
+      <th scope="row"><b>Name: </b></th>
+      <td style="padding-left: 4px;">{{PlanDefinition.name}}</td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.title.exists() %}
+    <tr>
+      <th scope="row"><b>Title: </b></th>
+      <td style="padding-left: 4px;">{{PlanDefinition.title}}</td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.subtitle.exists() %}
+    <tr>
+      <th scope="row"><b>Subtitle: </b></th>
+      <td style="padding-left: 4px;">{{PlanDefinition.subtitle}}</td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.status.exists() %}
+    <tr>
+      <th scope="row"><b>Status: </b></th>
+      <td style="padding-left: 4px;">{{PlanDefinition.status.value}}</td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.experimental.exists() %}
+    <tr>
+      <th scope="row"><b>Experimental: </b></th>
+      <td style="padding-left: 4px;">{{PlanDefinition.experimental.value}}</td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.type.exists() %}
+    <tr>
+      <th scope="row"><b>Type: </b></th>
+      <td style="padding-left: 4px;">
+        {% if PlanDefinition.type.coding.exists() %}
+        {% for coding in PlanDefinition.type.coding %}
+        {% if coding.system.exists() %}
+        <p style="margin-bottom: 5px;">
+          <b>system: </b> <span>{{coding.system}}</span>
+        </p>
         {% endif %}
-        {% for identifier in PlanDefinition.identifier %}
-        <tr>
-            <th scope="row"><b>Identifier: </b></th>
-            <td style="padding-left: 4px;">
-                {% if identifier.type.exists() %}
-                <p style="margin-bottom: 5px;">
-                    <b>type: </b> <span>{{identifier.type.value}}</span>
-                </p>
-                {% endif %}
-                {% if identifier.value.exists() %}
-                <p style="margin-bottom: 5px;">
-                    <b>value: </b> <span>{{identifier.value}}</span>
-                </p>
-                {% endif %}
-            </td>
-        </tr>
-        {% endfor %}
-        {% if PlanDefinition.name.exists() %}
-        <tr>
-            <th scope="row"><b>Name: </b></th>
-            <td style="padding-left: 4px;">{{PlanDefinition.name}}</td>
-        </tr>
+        {% if coding.code.exists() %}
+        <p style="margin-bottom: 5px;">
+          <b>code: </b> <span>{{coding.code}}</span>
+        </p>
         {% endif %}
-        {% if PlanDefinition.title.exists() %}
-        <tr>
-            <th scope="row"><b>Title: </b></th>
-            <td style="padding-left: 4px;">{{PlanDefinition.title}}</td>
-        </tr>
+        {% if coding.display.exists() %}
+        <p style="margin-bottom: 5px;">
+          <b>display: </b> <span>{{coding.display}}</span>
+        </p>
         {% endif %}
-        {% if PlanDefinition.subtitle.exists() %}
-        <tr>
-            <th scope="row"><b>Subtitle: </b></th>
-            <td style="padding-left: 4px;">{{PlanDefinition.subtitle}}</td>
-        </tr>
+        {% endfor %}
         {% endif %}
-        {% if PlanDefinition.status.exists() %}
-        <tr>
-            <th scope="row"><b>Status: </b></th>
-            <td style="padding-left: 4px;">{{PlanDefinition.status.value}}</td>
-        </tr>
+        {% if PlanDefinition.type.coding.exists().not and PlanDefinition.type.text.exists() %}
+        {{PlanDefinition.type.text}}
         {% endif %}
-        {% if PlanDefinition.experimental.exists() %}
-        <tr>
-            <th scope="row"><b>Experimental: </b></th>
-            <td style="padding-left: 4px;">{{PlanDefinition.experimental.value}}</td>
-        </tr>
+      </td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.subject.exists() %}
+    <tr>
+      <th scope="row"><b>Subject: </b></th>
+      {%if PlanDefinition.subject is CodeableConcept %}
+      <td style="padding-left: 4px;">
+        {% if PlanDefinition.subject.coding.exists() %}
+        {% for coding in PlanDefinition.subject.coding %}
+        {% if coding.system.exists() %}
+        <p style="margin-bottom: 5px;">
+          <b>system: </b> <span>{{coding.system}}</span>
+        </p>
         {% endif %}
-        {% if PlanDefinition.type.exists() %}
-        <tr>
-            <th scope="row"><b>Type: </b></th>
-            <td style="padding-left: 4px;">
-                {% if PlanDefinition.type.coding.exists() %}
-                    {% for coding in PlanDefinition.type.coding %}
-                        {% if coding.system.exists() %}
-                        <p style="margin-bottom: 5px;">
-                            <b>system: </b> <span>{{coding.system}}</span>
-                        </p>
-                        {% endif %}
-                        {% if coding.code.exists() %}
-                        <p style="margin-bottom: 5px;">
-                            <b>code: </b> <span>{{coding.code}}</span>
-                        </p>
-                        {% endif %}
-                        {% if coding.display.exists() %}
-                        <p style="margin-bottom: 5px;">
-                            <b>display: </b> <span>{{coding.display}}</span>
-                        </p>
-                        {% endif %}
-                    {% endfor %}
-                {% endif %}
-                {% if PlanDefinition.type.coding.exists().not and PlanDefinition.type.text.exists() %}
-                    {{PlanDefinition.type.text}}
-                {% endif %}
-            </td>
-        </tr>
-        {% endif %}
-        {% if PlanDefinition.subject.exists() %}
-        <tr>
-            <th scope="row"><b>Subject: </b></th>
-            {%if PlanDefinition.subject is CodeableConcept %}
-            <td style="padding-left: 4px;">
-                {% if PlanDefinition.subject.coding.exists() %}
-                    {% for coding in PlanDefinition.subject.coding %}
-                        {% if coding.system.exists() %}
-                        <p style="margin-bottom: 5px;">
-                            <b>system: </b> <span>{{coding.system}}</span>
-                        </p>
-                        {% endif %}
-                        {% if coding.code.exists() %}
-                        <p style="margin-bottom: 5px;">
-                            <b>code: </b> <span>{{coding.code}}</span>
-                        </p>
-                        {% endif %}
-                        {% if coding.display.exists() %}
-                        <p style="margin-bottom: 5px;">
-                            <b>display: </b> <span>{{coding.display}}</span>
-                        </p>
-                        {% endif %}
-                    {% endfor %}
-                {% endif %}
-                {% if PlanDefinition.subject.coding.exists().not and PlanDefinition.subject.text.exists() %}
-                    {{PlanDefinition.subject.text}}
-                {% endif %}
-            </td>
-            {% endif %}
-            {% if PlanDefinition.subject is Reference %}
-            <td style="padding-left: 4px;">
-                {% if PlanDefinition.subject.reference.exists() %}
-                <p style="margin-bottom: 5px;">
-                    <b>reference: </b> <span>{{PlanDefinition.subject.reference}}</span>
-                </p>
-                {% endif %}
-                {% if PlanDefinition.subject.type.exists() %}
-                <p style="margin-bottom: 5px;">
-                    <b>type: </b> <span>{{PlanDefinition.subject.type}}</span>
-                </p>
-                {% endif %}
-                {% if PlanDefinition.subject.display.exists() %}
-                <p style="margin-bottom: 5px;">
-                    <b>code: </b> <span>{{PlanDefinition.subject.display}}</span>
-                </p>
-                {% endif %}
-            </td>
-            {% endif %}
-        </tr>
+        {% if coding.code.exists() %}
+        <p style="margin-bottom: 5px;">
+          <b>code: </b> <span>{{coding.code}}</span>
+        </p>
         {% endif %}
-        {% if PlanDefinition.date.exists() %}
-        <tr>
-            <th scope="row"><b>Date: </b></th>
-            <td style="padding-left: 4px;">{{PlanDefinition.date}}</td>
-        </tr>
+        {% if coding.display.exists() %}
+        <p style="margin-bottom: 5px;">
+          <b>display: </b> <span>{{coding.display}}</span>
+        </p>
         {% endif %}
-        {% if PlanDefinition.publisher.exists() %}
-        <tr>
-            <th scope="row"><b>Publisher: </b></th>
-            <td style="padding-left: 4px;">{{PlanDefinition.publisher}}</td>
-        </tr>
+        {% endfor %}
         {% endif %}
-        {% if PlanDefinition.description.exists() %}
-        <tr>
-            <th scope="row"><b>Description: </b></th>
-            <td style="padding-left: 4px;">{{PlanDefinition.description.escape('html')}}</td>
-        </tr>
+        {% if PlanDefinition.subject.coding.exists().not and PlanDefinition.subject.text.exists() %}
+        {{PlanDefinition.subject.text}}
         {% endif %}
-        {% if PlanDefinition.extension.where(url = 'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability').exists() %}
-        <tr>
-          <th scope="row"><b>Knowledge Capability: </b></th>
-          <td style="padding-left: 4px;">
-            {% for extension in PlanDefinition.extension.where(url = 'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability') %}{{extension.value}} {% endfor %}
-          </td>
-        </tr>
+      </td>
+      {% endif %}
+      {% if PlanDefinition.subject is Reference %}
+      <td style="padding-left: 4px;">
+        {% if PlanDefinition.subject.reference.exists() %}
+        <p style="margin-bottom: 5px;">
+          <b>reference: </b> <span>{{PlanDefinition.subject.reference}}</span>
+        </p>
         {% endif %}
-        {% if PlanDefinition.extension.where(url = 'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeRepresentationLevel').exists() %}
-        <tr>
-          <th scope="row"><b>Knowledge Representation Level: </b></th>
-          <td style="padding-left: 4px;">
-            {% for extension in PlanDefinition.extension.where(url = 'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeRepresentationLevel') %}{{extension.value}}{% endfor %}
-          </td>
-        </tr>
+        {% if PlanDefinition.subject.type.exists() %}
+        <p style="margin-bottom: 5px;">
+          <b>type: </b> <span>{{PlanDefinition.subject.type}}</span>
+        </p>
         {% endif %}
-        {% if PlanDefinition.useContext.exists() %}
-        <tr>
-            <th scope="row"><b>Use Context: </b></th>
-            <td style="padding-left: 4px;">
-                <table class="grid-dict">
-                    <tr><th><b>code</b></th><th><b>value</b></th><th><b>display</b></th></tr>
-                    {% for useContext in PlanDefinition.useContext %}
-                      <tr>
-                        <td>{{useContext.code.code}}</td>
-                        <td>{{(useContext.value as CodeableConcept).coding.first().code}}</td>
-                        <td>{{(useContext.value as CodeableConcept).coding.first().display.escape('html')}}</td>
-                      </tr>
-                    {% endfor %}
-                </table>
-            </td>
-        </tr>
+        {% if PlanDefinition.subject.display.exists() %}
+        <p style="margin-bottom: 5px;">
+          <b>code: </b> <span>{{PlanDefinition.subject.display}}</span>
+        </p>
         {% endif %}
-        {% if PlanDefinition.jurisdiction.exists() %}
-        <tr>
-            <th scope="row"><b>Jurisdiction: </b></th>
-            <td style="padding-left: 4px;">{{PlanDefinition.jurisdiction.first().coding.first().code}}</td>
-        </tr>
+      </td>
+      {% endif %}
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.date.exists() %}
+    <tr>
+      <th scope="row"><b>Date: </b></th>
+      <td style="padding-left: 4px;">{{PlanDefinition.date}}</td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.publisher.exists() %}
+    <tr>
+      <th scope="row"><b>Publisher: </b></th>
+      <td style="padding-left: 4px;">{{PlanDefinition.publisher}}</td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.description.exists() %}
+    <tr>
+      <th scope="row"><b>Description: </b></th>
+      <td style="padding-left: 4px;">{{PlanDefinition.description.escape('html')}}</td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.extension.where(url =
+    'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability').exists() %}
+    <tr>
+      <th scope="row"><b>Knowledge Capability: </b></th>
+      <td style="padding-left: 4px;">
+        {% for extension in PlanDefinition.extension.where(url =
+        'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability') %}{{extension.value}} {% endfor %}
+      </td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.extension.where(url =
+    'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeRepresentationLevel').exists() %}
+    <tr>
+      <th scope="row"><b>Knowledge Representation Level: </b></th>
+      <td style="padding-left: 4px;">
+        {% for extension in PlanDefinition.extension.where(url =
+        'http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeRepresentationLevel') %}{{extension.value}}{%
+        endfor %}
+      </td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.useContext.exists() %}
+    <tr>
+      <th scope="row"><b>Use Context: </b></th>
+      <td style="padding-left: 4px;">
+        <table class="grid-dict">
+          <tr>
+            <th><b>code</b></th>
+            <th><b>value</b></th>
+            <th><b>display</b></th>
+          </tr>
+          {% for useContext in PlanDefinition.useContext %}
+          <tr>
+            <td>{{useContext.code.code}}</td>
+            <td>{{(useContext.value as CodeableConcept).coding.first().code}}</td>
+            <td>{{(useContext.value as CodeableConcept).coding.first().display.escape('html')}}</td>
+          </tr>
+          {% endfor %}
+        </table>
+      </td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.jurisdiction.exists() %}
+    <tr>
+      <th scope="row"><b>Jurisdiction: </b></th>
+      <td style="padding-left: 4px;">{{PlanDefinition.jurisdiction.first().coding.first().code}}</td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.purpose.exists() %}
+    <tr>
+      <th scope="row"><b>Purpose: </b></th>
+      <td style="padding-left: 4px;">{{PlanDefinition.purpose.escape('html')}}</td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.usage.exists() %}
+    <tr>
+      <th scope="row"><b>Usage: </b></th>
+      <td style="padding-left: 4px;">{{PlanDefinition.usage.escape('html')}}</td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.copyright.exists() %}
+    <tr>
+      <th scope="row"><b>Copyright: </b></th>
+      <td style="padding-left: 4px;">{{PlanDefinition.copyright.escape('html')}}</td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.approvalDate.exists() %}
+    <tr>
+      <th scope="row"><b>Approval Date: </b></th>
+      <td style="padding-left: 4px;">{{PlanDefinition.approvalDate}}</td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.lastReviewDate.exists() %}
+    <tr>
+      <th scope="row"><b>Last Review Date: </b></th>
+      <td style="padding-left: 4px;">{{PlanDefinition.lastReviewDate}}</td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.effectivePeriod.exists() %}
+    <tr>
+      <th scope="row"><b>Effective Period: </b></th>
+      <td style="padding-left: 4px;">{{PlanDefinition.effectivePeriod.start}}..{{PlanDefinition.effectivePeriod.end}}
+      </td>
+    </tr>
+    {% endif %}
+    {% if PlanDefinition.relatedArtifact.exists() %}
+    <tr>
+      <th scope="row"><b>Related Artifacts: </b></th>
+      <td style="padding-left: 4px;">
+        {% if PlanDefinition.relatedArtifact.where(type = 'documentation' or type = 'justification').exists() %}
+        <p><b>Documentation</b></p>
+        <ul>
+          {% for artifact in PlanDefinition.relatedArtifact.where(type = 'documentation' or type = 'justification') %}
+          <li><a href="{{artifact.url}}">{{artifact.label}} {{artifact.display.escape('html')}}</a></li>
+          {% endfor %}
+        </ul>
         {% endif %}
-        {% if PlanDefinition.purpose.exists() %}
-        <tr>
-            <th scope="row"><b>Purpose: </b></th>
-            <td style="padding-left: 4px;">{{PlanDefinition.purpose.escape('html')}}</td>
-        </tr>
+        {% if PlanDefinition.relatedArtifact.where(type = 'citation').exists() %}
+        <p><b>References</b></p>
+        <ul>
+          {% for artifact in PlanDefinition.relatedArtifact.where(type = 'citation') %}
+          <li>{{artifact.citation}}<br /><a href="{{artifact.url}}">{{artifact.url}}</a></li>
+          {% endfor %}
+        </ul>
         {% endif %}
-        {% if PlanDefinition.usage.exists() %}
-        <tr>
-            <th scope="row"><b>Usage: </b></th>
-            <td style="padding-left: 4px;">{{PlanDefinition.usage.escape('html')}}</td>
-        </tr>
+        {% if PlanDefinition.relatedArtifact.where(type = 'depends-on').exists() %}
+        <p><b>Dependencies</b></p>
+        <table class="grid-dict">
+          <tr>
+            <th><b>Display</b></th>
+            <th><b>Resource Identifier &amp; Version</b></th>
+          </tr>
+          {% for artifact in PlanDefinition.relatedArtifact.where(type = 'depends-on') %}
+          <tr>
+            <td>
+              {{artifact.display}}
+            </td>
+            <td>
+              <a href="{{artifact.resource}}">{{artifact.resource}}</a>
+            </td>
+          </tr>
+          {% endfor %}
+        </table>
         {% endif %}
-        {% if PlanDefinition.copyright.exists() %}
-        <tr>
-            <th scope="row"><b>Copyright: </b></th>
-            <td style="padding-left: 4px;">{{PlanDefinition.copyright.escape('html')}}</td>
-        </tr>
+        {% if PlanDefinition.relatedArtifact.where(type = 'composed-of').exists() %}
+        <p><b>Components</b></p>
+        <ul>
+          {% for artifact in PlanDefinition.relatedArtifact.where(type = 'composed-of') %}
+          <li>{{artifact.resource}}</li>
+          {% endfor %}
+        </ul>
         {% endif %}
-        {% if PlanDefinition.approvalDate.exists() %}
-        <tr>
-            <th scope="row"><b>Approval Date: </b></th>
-            <td style="padding-left: 4px;">{{PlanDefinition.approvalDate}}</td>
-        </tr>
+        {% if PlanDefinition.relatedArtifact.where(type = 'derived-from').exists() %}
+        <p><b>Derived From</b></p>
+        <ul>
+          {% for artifact in PlanDefinition.relatedArtifact.where(type = 'derived-from') %}
+          <li>{{artifact.resource}}</li>
+          {% endfor %}
+        </ul>
         {% endif %}
-        {% if PlanDefinition.lastReviewDate.exists() %}
-        <tr>
-            <th scope="row"><b>Last Review Date: </b></th>
-            <td style="padding-left: 4px;">{{PlanDefinition.lastReviewDate}}</td>
-        </tr>
+        {% if PlanDefinition.relatedArtifact.where(type = 'successor').exists() %}
+        <p><b>Successor</b></p>
+        <ul>
+          {% for artifact in PlanDefinition.relatedArtifact.where(type = 'successor') %}
+          <li>{{artifact.resource}}</li>
+          {% endfor %}
+        </ul>
         {% endif %}
-        {% if PlanDefinition.effectivePeriod.exists() %}
-        <tr>
-            <th scope="row"><b>Effective Period: </b></th>
-            <td style="padding-left: 4px;">{{PlanDefinition.effectivePeriod.start}}..{{PlanDefinition.effectivePeriod.end}}</td>
-        </tr>
-        {% endif %}
-        {% if PlanDefinition.relatedArtifact.exists() %}
-        <tr>
-          <th scope="row"><b>Related Artifacts: </b></th>
-          <td style="padding-left: 4px;">
-            {% if PlanDefinition.relatedArtifact.where(type = 'documentation' or type = 'justification').exists() %}
-            <p><b>Documentation</b></p>
-            <ul>
-              {% for artifact in PlanDefinition.relatedArtifact.where(type = 'documentation' or type = 'justification') %}
-                <li><a href="{{artifact.url}}">{{artifact.label}} {{artifact.display.escape('html')}}</a></li>
-              {% endfor %}
-            </ul>
-            {% endif %}
-            {% if PlanDefinition.relatedArtifact.where(type = 'citation').exists() %}
-            <p><b>References</b></p>
-            <ul>
-              {% for artifact in PlanDefinition.relatedArtifact.where(type = 'citation') %}
-                <li>{{artifact.citation}}<br/><a href="{{artifact.url}}">{{artifact.url}}</a></li>
-              {% endfor %}
-            </ul>
-            {% endif %}
-            {% if PlanDefinition.relatedArtifact.where(type = 'depends-on').exists() %}
-            <p><b>Dependencies</b></p>
-            <ul>
-              {% for artifact in PlanDefinition.relatedArtifact.where(type = 'depends-on') %}
-                <li>{{artifact.resource}}</li>
-              {% endfor %}
-            </ul>
-            {% endif %}
-            {% if PlanDefinition.relatedArtifact.where(type = 'composed-of').exists() %}
-            <p><b>Components</b></p>
-            <ul>
-              {% for artifact in PlanDefinition.relatedArtifact.where(type = 'composed-of') %}
-                <li>{{artifact.resource}}</li>
-              {% endfor %}
-            </ul>
-            {% endif %}
-            {% if PlanDefinition.relatedArtifact.where(type = 'derived-from').exists() %}
-            <p><b>Derived From</b></p>
-            <ul>
-              {% for artifact in PlanDefinition.relatedArtifact.where(type = 'derived-from') %}
-                <li>{{artifact.resource}}</li>
-              {% endfor %}
-            </ul>
-            {% endif %}
-            {% if PlanDefinition.relatedArtifact.where(type = 'successor').exists() %}
-            <p><b>Successor</b></p>
-            <ul>
-              {% for artifact in PlanDefinition.relatedArtifact.where(type = 'successor') %}
-                <li>{{artifact.resource}}</li>
-              {% endfor %}
-            </ul>
-            {% endif %}
-            {% if PlanDefinition.relatedArtifact.where(type = 'predecessor').exists() %}
-            <p><b>Predecessor</b></p>
-            <ul>
-              {% for artifact in PlanDefinition.relatedArtifact.where(type = 'predecessor') %}
-                <li>{{artifact.resource}}</li>
-              {% endfor %}
-            </ul>
-            {% endif %}
-          </td>
-        </tr>
+        {% if PlanDefinition.relatedArtifact.where(type = 'predecessor').exists() %}
+        <p><b>Predecessor</b></p>
+        <ul>
+          {% for artifact in PlanDefinition.relatedArtifact.where(type = 'predecessor') %}
+          <li>{{artifact.resource}}</li>
+          {% endfor %}
+        </ul>
         {% endif %}
+      </td>
+    </tr>
+    {% endif %}
 
-        {% if PlanDefinition.library.exists() %}
-        <tr>
-          <th scope="row"><b>Libraries: </b></th>
-          <td style="padding-left: 4px;">
-            <table class="grid-dict">
-              {% for library in PlanDefinition.library %}
-                <tr><td>{{library}}</td></tr>
-              {% endfor %}
-            </table>
-          </td>
-        </tr>
-        {% endif %}
+    {% if PlanDefinition.library.exists() %}
+    <tr>
+      <th scope="row"><b>Libraries: </b></th>
+      <td style="padding-left: 4px;">
+        <table class="grid-dict">
+          {% for library in PlanDefinition.library %}
+          <tr>
+            <td>{{library}}</td>
+          </tr>
+          {% endfor %}
+        </table>
+      </td>
+    </tr>
+    {% endif %}
 
-        {% if PlanDefinition.action.exists() %}
-        <tr>
-          <th scope="row"><b>Actions: </b></th>
-          <td style="padding-left: 4px;">
-            <table class="grid-dict">
-              {% for action in PlanDefinition.action %}
+    {% if PlanDefinition.action.exists() %}
+    <tr>
+      <th scope="row"><b>Actions: </b></th>
+      <td style="padding-left: 4px;">
+        <table class="grid-dict">
+          {% for action in PlanDefinition.action %}
+          <tr>
+            <td>
+              {% if action.textEquivalent.exists() %}{{action.textEquivalent.escape('html')}}{% else
+              %}<b>{{action.prefix}} {{action.title.escape('html')}}:</b> {{action.description.escape('html')}}{% endif
+              %}<br />
+              {% if action.trigger.exists() %}<b>When:</b> {% for trigger in action.trigger %}<i>{{trigger.type}}:</i>
+              {{trigger.name.escape('html')}}<br />{% endfor %}{% endif %}
+              {% if action.condition.exists() %}<b>If:</b> {% for condition in action.condition
+              %}<i>{{condition.kind}}:</i> {% if condition.expression.description.exists()
+              %}{{condition.expression.description.escape('html')}}{% endif %}
+              <i>({{condition.expression.expression.escape('html')}})</i><br />{% endfor %}{% endif %}
+              {% if action.action.exists() %}
+              <b>Then:</b>
+              <table class="grid-dict">
+                {% for action in action.action %}
                 <tr>
                   <td>
-                    {% if action.textEquivalent.exists() %}{{action.textEquivalent.escape('html')}}{% else %}<b>{{action.prefix}} {{action.title.escape('html')}}:</b> {{action.description.escape('html')}}{% endif %}<br/>
-                    {% if action.trigger.exists() %}<b>When:</b> {% for trigger in action.trigger %}<i>{{trigger.type}}:</i> {{trigger.name.escape('html')}}<br/>{% endfor %}{% endif %}
-                    {% if action.condition.exists() %}<b>If:</b> {% for condition in action.condition %}<i>{{condition.kind}}:</i> {% if condition.expression.description.exists() %}{{condition.expression.description.escape('html')}}{% endif %} <i>({{condition.expression.expression.escape('html')}})</i><br/>{% endfor %}{% endif %}
+                    {% if action.textEquivalent.exists() %}{{action.textEquivalent.escape('html')}}{% else
+                    %}<b>{{action.prefix}} {{action.title.escape('html')}}:</b> {{action.description.escape('html')}}{%
+                    endif %}<br />
+                    {% if action.trigger.exists() %}<b>When:</b> {% for trigger in action.trigger
+                    %}<i>{{trigger.type}}:</i> {{trigger.name.escape('html')}}<br />{% endfor %}{% endif %}
+                    {% if action.condition.exists() %}<b>If:</b> {% for condition in action.condition
+                    %}<i>{{condition.kind}}:</i> {% if condition.expression.description.exists()
+                    %}{{condition.expression.description.escape('html')}}{% endif %}
+                    <i>({{condition.expression.expression.escape('html')}})</i><br />{% endfor %}{% endif %}
                     {% if action.action.exists() %}
-                      <b>Then:</b>
-                      <table class="grid-dict">
-                        {% for action in action.action %}
-                          <tr>
-                            <td>
-                              {% if action.textEquivalent.exists() %}{{action.textEquivalent.escape('html')}}{% else %}<b>{{action.prefix}} {{action.title.escape('html')}}:</b> {{action.description.escape('html')}}{% endif %}<br/>
-                              {% if action.trigger.exists() %}<b>When:</b> {% for trigger in action.trigger %}<i>{{trigger.type}}:</i> {{trigger.name.escape('html')}}<br/>{% endfor %}{% endif %}
-                              {% if action.condition.exists() %}<b>If:</b> {% for condition in action.condition %}<i>{{condition.kind}}:</i> {% if condition.expression.description.exists() %}{{condition.expression.description.escape('html')}}{% endif %} <i>({{condition.expression.expression.escape('html')}})</i><br/>{% endfor %}{% endif %}
-                              {% if action.action.exists() %}
-                                <b>Then:</b>
-                                <table class="grid-dict">
-                                  {% for action in action.action %}
-                                    <tr>
-                                      <td>
-                                        {% if action.textEquivalent.exists() %}{{action.textEquivalent.escape('html')}}{% else %}<b>{{action.prefix}} {{action.title.escape('html')}}:</b> {{action.description.escape('html')}}{% endif %}<br/>
-                                        {% if action.trigger.exists() %}<b>When:</b> {% for trigger in action.trigger %}<i>{{trigger.type}}:</i> {{trigger.name.escape('html')}}<br/>{% endfor %}{% endif %}
-                                        {% if action.condition.exists() %}<b>If:</b> {% for condition in action.condition %}<i>{{condition.kind}}:</i> {% if condition.expression.description.exists() %}{{condition.expression.description.escape('html')}}{% endif %} <i>({{condition.expression.expression.escape('html')}})</i><br/>{% endfor %}{% endif %}
-                                        {% if action.action.exists() %}
-                                        <b>Then:</b> <i>Additional sub-actions not displayed</i>
-                                        {% else %}
-                                          {% if action.definition.exists() %}
-                                            <b>Then:</b> <i>Definition:</i> {{action.definition}}<br/>
-                                            {% if action.dynamicValue.exists() %}
-                                              <i>Dynamic Values:</i><br/>
-                                              {% for dynamicValue in action.dynamicValue %}
-                                                {{dynamicValue.path}}: <i>({{dynamicValue.expression.expression.escape('html')}})</i><br/>
-                                              {% endfor %}
-                                            {% endif %}
-                                          {% endif %}
-                                        {% endif %}
-                                      </td>
-                                    </tr>
-                                  {% endfor %}
-                                </table>
-                              {% else %}
-                                {% if action.definition.exists() %}
-                                  <b>Then:</b> <i>Definition:</i> {{action.definition}}<br/>
-                                  {% if action.dynamicValue.exists() %}
-                                    <i>Dynamic Values:</i><br/>
-                                    {% for dynamicValue in action.dynamicValue %}
-                                      {{dynamicValue.path}}: <i>({{dynamicValue.expression.expression.escape('html')}})</i><br/>
-                                    {% endfor %}
-                                  {% endif %}
-                                {% endif %}
-                              {% endif %}
-                            </td>
-                          </tr>
-                        {% endfor %}
-                      </table>
-                    {% else %}
-                      {% if action.definition.exists() %}
-                      <b>Then:</b> <i>Definition:</i> {{action.definition}}<br/>
-                        {% if action.dynamicValue.exists() %}
-                          <i>Dynamic Values:</i><br/>
+                    <b>Then:</b>
+                    <table class="grid-dict">
+                      {% for action in action.action %}
+                      <tr>
+                        <td>
+                          {% if action.textEquivalent.exists() %}{{action.textEquivalent.escape('html')}}{% else
+                          %}<b>{{action.prefix}} {{action.title.escape('html')}}:</b>
+                          {{action.description.escape('html')}}{% endif %}<br />
+                          {% if action.trigger.exists() %}<b>When:</b> {% for trigger in action.trigger
+                          %}<i>{{trigger.type}}:</i> {{trigger.name.escape('html')}}<br />{% endfor %}{% endif %}
+                          {% if action.condition.exists() %}<b>If:</b> {% for condition in action.condition
+                          %}<i>{{condition.kind}}:</i> {% if condition.expression.description.exists()
+                          %}{{condition.expression.description.escape('html')}}{% endif %}
+                          <i>({{condition.expression.expression.escape('html')}})</i><br />{% endfor %}{% endif %}
+                          {% if action.action.exists() %}
+                          <b>Then:</b> <i>Additional sub-actions not displayed</i>
+                          {% else %}
+                          {% if action.definition.exists() %}
+                          <b>Then:</b> <i>Definition:</i> {{action.definition}}<br />
+                          {% if action.dynamicValue.exists() %}
+                          <i>Dynamic Values:</i><br />
                           {% for dynamicValue in action.dynamicValue %}
-                            {{dynamicValue.path}}: <i>({{dynamicValue.expression.expression.escape('html')}})</i><br/>
+                          {{dynamicValue.path}}: <i>({{dynamicValue.expression.expression.escape('html')}})</i><br />
                           {% endfor %}
-                        {% endif %}
-                      {% endif %}
+                          {% endif %}
+                          {% endif %}
+                          {% endif %}
+                        </td>
+                      </tr>
+                      {% endfor %}
+                    </table>
+                    {% else %}
+                    {% if action.definition.exists() %}
+                    <b>Then:</b> <i>Definition:</i> {{action.definition}}<br />
+                    {% if action.dynamicValue.exists() %}
+                    <i>Dynamic Values:</i><br />
+                    {% for dynamicValue in action.dynamicValue %}
+                    {{dynamicValue.path}}: <i>({{dynamicValue.expression.expression.escape('html')}})</i><br />
+                    {% endfor %}
+                    {% endif %}
+                    {% endif %}
                     {% endif %}
                   </td>
                 </tr>
+                {% endfor %}
+              </table>
+              {% else %}
+              {% if action.definition.exists() %}
+              <b>Then:</b> <i>Definition:</i> {{action.definition}}<br />
+              {% if action.dynamicValue.exists() %}
+              <i>Dynamic Values:</i><br />
+              {% for dynamicValue in action.dynamicValue %}
+              {{dynamicValue.path}}: <i>({{dynamicValue.expression.expression.escape('html')}})</i><br />
               {% endfor %}
-            </table>
-          </td>
-        </tr>
-        {% endif %}
-    </table>
-</div>
+              {% endif %}
+              {% endif %}
+              {% endif %}
+            </td>
+          </tr>
+          {% endfor %}
+        </table>
+      </td>
+    </tr>
+    {% endif %}
+  </table>
+</div>
\ No newline at end of file