diff --git a/lib/noticelist.php b/lib/noticelist.php
index bf12bb73c5..3bad2cf7ca 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -199,8 +199,8 @@ class NoticeListItem extends Widget
     {
         $this->out->elementStart('div', 'entry-content');
         $this->showNoticeLink();
-        $this->showNoticeLocation();
         $this->showNoticeSource();
+        $this->showNoticeLocation();
         $this->showContext();
         $this->out->elementEnd('div');
     }
@@ -399,13 +399,18 @@ class NoticeListItem extends Widget
 
         $url  = $location->getUrl();
 
+        // TODO: Output @title lat and lon on element @class geo
+        // e.g., class="geo" title="45.5088375;-73.587809"
+        $this->out->elementStart('span', array('class' => 'location'));
+        $this->out->text(_('at'));
         if (empty($url)) {
-            $this->out->element('span', array('class' => 'location'), $name);
+            $this->out->element('span', array('class' => 'geo'), $name);
         } else {
-            $this->out->element('a', array('class' => 'location',
+            $this->out->element('a', array('class' => 'geo',
                                            'href' => $url),
                                 $name);
         }
+        $this->out->elementEnd('span');
     }
 
     /**
diff --git a/plugins/LinkbackPlugin.php b/plugins/LinkbackPlugin.php
index 915d15c075..f220fff8f6 100644
--- a/plugins/LinkbackPlugin.php
+++ b/plugins/LinkbackPlugin.php
@@ -59,7 +59,7 @@ class LinkbackPlugin extends Plugin
         parent::__construct();
     }
 
-    function onEndNoticeSave($notice)
+    function onHandleQueuedNotice($notice)
     {
         if ($notice->is_local == 1) {
             // Try to avoid actually mucking with the
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 2cff03d6c8..c5fb6de038 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -125,7 +125,7 @@ class RealtimePlugin extends Plugin
         return true;
     }
 
-    function onEndNoticeSave($notice)
+    function onHandleQueuedNotice($notice)
     {
         $paths = array();