diff --git a/templates/index.html b/templates/index.html
index 22bf7eb..daf22ad 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -29,7 +29,8 @@
        <td> {{ i['object_name'] }} </td>
        <td> {{ i['raw'] }} </td>
        <td> {{ i['created'] }} </td>
-       <td> <a href="https://digi.w1cdn.net/aprs_api/packets?id={{ i['id'] }}">more</a>
+       <td> <a href="https://digi.w1cdn.net/aprs_api/packets?id={{ i['id'] }}">query</a>,
+            <a href="https://aprs.fi/#!mt=roadmap&z=12&call=a%2F{{ i['from'] }}">aprs.fi</a></td>
      </tr>
       {% endfor %}
   </table>
@@ -42,12 +43,14 @@ Coming soon, see <a href="https://amiok.net/gitea/W1CDN/aprs_tool/issues/16">htt
    <th> from </th>
    <th> last heard (utc) </th>
    <th> count </th>
+   <th> more </th>
  </tr>
      {% for i in stations %}
   <tr>
     <td> <a href="https://digi.w1cdn.net/aprs_api/packets?from={{ i['from'] }}">{{ i['from'] }}</a> </td>
     <td> {{ i['created'] }} </td>
     <td> {{ i['COUNT(id)']}} </td>
+    <td> <a href="https://aprs.fi/#!mt=roadmap&z=12&call=a%2F{{ i['from'] }}">aprs.fi</a></td>
   </tr>
    {% endfor %}
 </table>