diff --git a/templates/partials/miniposts.html.twig b/templates/partials/miniposts.html.twig
index 6a18f91..b99f541 100644
--- a/templates/partials/miniposts.html.twig
+++ b/templates/partials/miniposts.html.twig
@@ -8,8 +8,18 @@
   </header>
   <div class="mini-posts">
     {% for p in page.evaluate({'@taxonomy.category':miniposts_category}).order('header.order', 'asc').slice(0,miniposts_number) %}
-    {% set image = p.media[p.header.primaryImage] ?: p.media.images|first %}
+    
+    {% if p.header.metadata.author %}
+      {% set author = p.header.metadata.author %}
+    {% elseif p.header.author %}
+      {% set author = p.header.author %}
+    {% else %}
+        {% set author = p.taxonomy.author[0] %}
+    {% endif %}
     {% set title = p.title|raw %}
+    {% set avatar = p.media[p.header.avatarImage].url|e  %}
+    {% set image = p.media[p.header.primaryImage] ?: p.media.all|filter((v, k) => k != p.header.avatarImage and (v.type == 'image' or v.type == 'vector'))|first %}
+
       <article class="mini-post">
         <header>
           <h3>
@@ -23,7 +33,7 @@
             <time class="published" itemprop="datePublished" datetime="{{ page.date|date("Y-m-d") }}">{{ page.date|date("M j, Y") }}</time>
           {% endif %}
         {% if avatar %}
-          <a href="{{ p.url }}" class="author"><img src="{{ p.media[p.header.avatarImage].url}}" alt=""/></a>
+          <a href="{{ p.url }}" class="author" title="{{ author }}"><img src="{{ avatar }}" alt="{{ author }}"/></a>
         {% endif %}
         </header>
         {% if image %}