--- guestbook.module	2009-08-11 09:34:17.000000000 -0500
+++ guestbook.module_NEW	2009-08-11 09:32:40.000000000 -0500
@@ -807,19 +807,18 @@ function theme_guestbook_entry($uid, $en
         $links['delete'] = array(
           'title' => t('Delete entry'),
           'href' => guestbook_path($uid) .'/delete/'. $entry['id'],
-          'query' => 'destination='. url($_GET['q']) . $pager,
+          'query' => drupal_get_destination(),
         );
         $links['edit'] = array(
           'title' => t('Edit entry'),
           'href' => guestbook_path($uid) .'/edit/'. $entry['id'],
-          'query' => 'destination='. url($_GET['q']) . $pager,
+          'query' => drupal_get_destination(),
         );
       }
       $links['comment'] = array(
         'title' => $entry['comment'] == '' ? t('Add comment') : t('Edit comment'),
         'href' => guestbook_path($uid) .'/comment/'. $entry['id'],
-        'query' => 'destination='. url($_GET['q']) . $pager,
-        'fragment' => 'comment-entry',
+        'query' => drupal_get_destination(),
       );
       $output .= theme('links', $links, array('class' => 'guestbook-links'));
     }