diff --git a/kjvstudy_org/templates/chapter.html b/kjvstudy_org/templates/chapter.html
index 8c9e069..3a11f97 100644
--- a/kjvstudy_org/templates/chapter.html
+++ b/kjvstudy_org/templates/chapter.html
@@ -458,11 +458,11 @@ document.body.dataset.resourceReader = 'false';
         <a href="/book/{{ book }}/chapter/{{ chapter }}/verse/{{ verse.verse }}" class="verse-number-link{% if has_commentary %} has-commentary{% endif %}">{{ verse.verse }}</a> {{ verse.text | red_letter(book, chapter, verse.verse) | inject_word_markers(commentary.word_studies if commentary else [], verse.verse) | link_names | safe }}
         {% if commentary %}
             {% if commentary.cross_reference_groups %}
-                {% set total_refs = commentary.cross_reference_groups | sum(attribute='refs', start=[]) | length %}
-                {% set preview_count = commentary.cross_reference_groups | length %}
+                {% set ns = namespace(total=0, preview=0) %}
+                {% for group in commentary.cross_reference_groups %}{% set ns.total = ns.total + group.refs|length %}{% set ns.preview = ns.preview + ([group.refs|length, 3]|min) %}{% endfor %}
                 <label for="sn-{{ verse.verse }}-xrefs" class="margin-toggle sidenote-number"></label>
                 <input type="checkbox" id="sn-{{ verse.verse }}-xrefs" class="margin-toggle"/>
-                <span class="sidenote cross-refs">{% for group in commentary.cross_reference_groups %}<strong>{{ group.description }}:</strong> <a href="{{ group.refs[0].url }}">{{ group.refs[0].text }}</a>{% if group.refs|length > 1 %}<span class="xref-extra">; {% for ref in group.refs[1:] %}<a href="{{ ref.url }}">{{ ref.text }}</a>{% if not loop.last %}; {% endif %}{% endfor %}</span>{% endif %}{% if not loop.last %}. {% endif %}{% endfor %}{% if total_refs > preview_count %}<span class="xref-more"> +{{ total_refs - preview_count }}</span>{% endif %}</span>
+                <span class="sidenote cross-refs">{% for group in commentary.cross_reference_groups %}<strong>{{ group.description }}:</strong> {% for ref in group.refs[:3] %}<a href="{{ ref.url }}">{{ ref.text }}</a>{% if not loop.last %}; {% endif %}{% endfor %}{% if group.refs|length > 3 %}<span class="xref-extra">; {% for ref in group.refs[3:] %}<a href="{{ ref.url }}">{{ ref.text }}</a>{% if not loop.last %}; {% endif %}{% endfor %}</span>{% endif %}{% if not loop.last %}. {% endif %}{% endfor %}{% if ns.total > ns.preview %}<span class="xref-more"> +{{ ns.total - ns.preview }}</span>{% endif %}</span>
             {% endif %}
         {% endif %}
     </p>