1 files changed, 5 insertions, 3 deletions

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 8305ba5..55bd713 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -314,8 +314,11 @@ class PHPFSPOT {
       $this->tmpl->assign('from_date', $this->get_calendar('from'));
       $this->tmpl->assign('to_date', $this->get_calendar('to'));
 
-      if(!isset($content))
+      if(!isset($content)) {
+         $this->tmpl->assign('preset_selected_tags', $this->getSelectedTags());
+         $this->tmpl->assign('preset_available_tags', $this->getAvailableTags());
          $this->tmpl->assign('content_page', $this->tmpl->fetch('welcome.tpl'));
+      }
       else
          $this->tmpl->assign('content_page', $content);
 
@@ -733,7 +736,7 @@ class PHPFSPOT {
       }
 
       $output = substr($output, 0, strlen($output)-2);
-      print $output;
+      return $output;
 
    } // getAvailableTags()
 
@@ -3121,7 +3124,6 @@ class PHPFSPOT {
                if(is_numeric($options[2])) {
                   $_GET['mode'] = 'showpi';
                   $_SESSION['selected_tags'] = Array($options[2]);
-                  $this->tmpl->assign('preset_selected_tags', $this->getSelectedTags());
                   $_GET['tags'] = $options[2];
                   return $this->showPhotoIndex();
                }