diff --git a/data/scripts/generate-gemlog.lisp b/data/scripts/generate-gemlog.lisp
index f5e6c94..d1243f9 100644
--- a/data/scripts/generate-gemlog.lisp
+++ b/data/scripts/generate-gemlog.lisp
@@ -286,7 +286,8 @@
                   ((tag= :quote node)
                    (geminize-quote child))
                   ((tag= :a node)
-                   (geminize-link (strcat (attribute-value (find-attribute :href node))
+                   (geminize-link (strcat " "
+                                          (attribute-value (find-attribute :href node))
                                           " "
                                           child)))
                   ((or (tag= :pre node)
@@ -316,7 +317,8 @@
                                     :if-does-not-exist :create
                                     :if-exists         :supersede)
               (sexp->gmi (content post) stream)
-              (write-sequence (geminize-link (strcat *post-home-backlink*
+              (write-sequence (geminize-link (strcat " "
+                                                     *post-home-backlink*
                                                      " "
                                                      *post-home-backlink-name*))
                               stream)
@@ -361,9 +363,10 @@
       (write-char #\Newline gemlog-stream)
       (write-links all-posts gemlog-stream)
       (format gemlog-stream "~%")
-      (write-sequence (geminize-link (strcat *indices-home-backlink*
-                                               " "
-                                               *indices-home-backlink-name*))
+      (write-sequence (geminize-link (strcat " "
+                                             *indices-home-backlink*
+                                             " "
+                                             *indices-home-backlink-name*))
                       gemlog-stream)
       (write-char #\Newline gemlog-stream))))
 
@@ -386,7 +389,8 @@
                                              all-posts)))
           (write-links in-topic-posts stream)
           (format stream "~%")))
-      (write-sequence (geminize-link (strcat *indices-home-backlink*
+      (write-sequence (geminize-link (strcat " "
+                                             *indices-home-backlink*
                                              " "
                                              *indices-home-backlink-name*))
                       stream)
diff --git a/src/api-client.lisp b/src/api-client.lisp
index bc17050..9dd82b3 100644
--- a/src/api-client.lisp
+++ b/src/api-client.lisp
@@ -434,10 +434,10 @@ Returns nil if the user did not provided a server in the configuration file"
                            :min-id     nil
                            :limit      limit)))))
 
-(defun-api-call update-timeline-tag (tag folder &key
-                                                (recover-count 0)
-                                                min-id
-                                                (limit 20))
+(defun update-timeline-tag (tag folder &key
+                                         (recover-count 0)
+                                         min-id
+                                         (limit 20))
   "Update a tag timeline, this  function will fetch new messages (that
   contains tag  `tag') and  generate and event  to update  the program
   reflectings  the changes  in  the timeline  (saves  messages in  the
@@ -486,7 +486,7 @@ become an emty string (\"\")
   (when-let ((tag-info (tooter:tag-information *client* tag)))
     (tooter:history tag-info)))
 
-(defun-api-call update-subscribed-tags (all-tags all-max-id &key (limit 20))
+(defun update-subscribed-tags (all-tags all-max-id &key (limit 20))
   "Update all tage in the list `all-tags'"
   (loop
      for tag    in all-tags