diff --git a/application/modules/default/models/DbTable/Tags.php b/application/modules/default/models/DbTable/Tags.php
index 36db8542a..0f2e3e2b6 100644
--- a/application/modules/default/models/DbTable/Tags.php
+++ b/application/modules/default/models/DbTable/Tags.php
@@ -1,309 +1,314 @@
 <?php
 
 /**
  *  ocs-webserver
  *
  *  Copyright 2016 by pling GmbH.
  *
  *    This file is part of ocs-webserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    This program is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *    GNU Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 class Default_Model_DbTable_Tags extends Local_Model_Table
 {
     /** @var  Zend_Cache_Core */
     protected $cache;
     
     protected $_name = "tag";
 
     protected $_keyColumnsForRow = array('tag_id');
 
     protected $_key = 'tag_id';
 
     protected $_defaultValues = array(
         'tag_id'   => null,
         'tag_name' => null
     );
     
     const TAG_TYPE_PROJECT = 1;
     const TAG_TYPE_FILE = 3;
     
     const TAG_GROUP_USER = 5;
     const TAG_GROUP_CATEGORY = 6;
     const TAG_GROUP_LICENSE = 7;
     const TAG_GROUP_PACKAGETYPE = 8;
     const TAG_GROUP_ARCHITECTURE = 9;
     const TAG_GROUP_GHNS_EXCLUDED = 10;
     const TAG_GHNS_EXCLUDED_ID = 1529;
     /**
      * @inheritDoc
      */
     public function init()
     {
         parent::init(); // TODO: Change the autogenerated stub
         $this->cache = Zend_Registry::get('cache');
     }
     
     
     /**
      * @param string $tags
      *
      * @return array
      */
     public function storeTags($tags)
     {
         $arrayTags = explode(',', $tags);
         $sqlFetchTag = "SELECT `tag_id` FROM tag WHERE tag_name = :name";
         $resultIds = array();
         foreach ($arrayTags as $tag) {
             $resultRow = $this->_db->fetchRow($sqlFetchTag, array('name' => $tag));
             if (empty($resultRow)) {
                 $this->_db->insert($this->_name, array('tag_name' => $tag));
                 $resultIds[] = $this->_db->lastInsertId();
             } else {
                 $resultIds[] = $resultRow['tag_id'];
             }
         }
 
         return $resultIds;
     }
 
      /**
      * @param string $tags
      *
      * @return array
      */
     public function storeTagsUser($tags)
     {
         $arrayTags = explode(',', strtolower($tags));
         $sqlFetchTag = "SELECT `tag_id` FROM tag WHERE tag_name = :name";
         $resultIds = array();
         foreach ($arrayTags as $tag) {
             if(strlen(trim($tag))==0) 
             {
                 continue;
             }
         
             $resultRow = $this->_db->fetchRow($sqlFetchTag, array('name' => $tag));
             if (empty($resultRow)) {
                 $this->_db->insert($this->_name, array('tag_name' => $tag));
                 $tagId = $this->_db->lastInsertId();
                 $resultIds[] = $tagId;
 
                 $sql = "SELECT tag_group_item_id FROM tag_group_item WHERE tag_group_id = :group_id AND tag_id = :tag_id";
                 $resultSet = $this->_db->fetchRow($sql, array('group_id' => Default_Model_DbTable_Tags::TAG_GROUP_USER, 'tag_id' =>$tagId));
                 if (empty($resultSet)) {
                     $this->_db->insert('tag_group_item', array('tag_group_id' => Default_Model_DbTable_Tags::TAG_GROUP_USER, 'tag_id' => $tagId));                    
                 }
 
             } else {
                 $resultIds[] = $resultRow['tag_id'];
 
                 $sql = "SELECT tag_group_item_id FROM tag_group_item WHERE tag_group_id = :group_id AND tag_id = :tag_id";
                 $resultSet = $this->_db->fetchRow($sql, array('group_id' => Default_Model_DbTable_Tags::TAG_GROUP_USER, 'tag_id' =>$resultRow['tag_id']));
                 if (empty($resultSet)) {
                     $this->_db->insert('tag_group_item', array('tag_group_id' => Default_Model_DbTable_Tags::TAG_GROUP_USER, 'tag_id' => $resultRow['tag_id']));                    
                 }
             }
         }
 
         return $resultIds;
     }
     
     
     /**
      * @return array
      */
     public function fetchArchitectureTagsForSelect()
     {
         return $this->fetchForGroupForSelect(Default_Model_DbTable_Tags::TAG_GROUP_ARCHITECTURE);
     }
     
     
     /**
      * @return array
      */
     public function fetchPackagetypeTagsForSelect()
     {
         return $this->fetchForGroupForSelect(Default_Model_DbTable_Tags::TAG_GROUP_PACKAGETYPE);
     }
     
     
     /**
      * @return array
      */
     public function fetchGhnsExcludedTagId()
     {
         return $this:: TAG_GHNS_EXCLUDED_ID;   
         // $tag = $this->fetchForGroupForSelect(Default_Model_DbTable_Tags::TAG_GROUP_GHNS_EXCLUDED);
         // $keys = array_keys($tag);
         // if(isset($keys) && count($keys) == 1) {
         //     return $keys[0];
         // }
         // return null;
     }
     
     
     
     /**
      * @return array
      */
     public function fetchLicenseTagsForSelect()
     {
         return $this->fetchForGroupForSelect(Default_Model_DbTable_Tags::TAG_GROUP_LICENSE);
     }
     
     /**
      * @param int|array $groupId
      * @return array
      */
-    public function fetchForGroupForSelect($groupId)
+    public function fetchForGroupForSelect($groupId, $withGroup = false)
     {
         $str = is_array($groupId) ? implode(',', $groupId) : $groupId;
         /** @var Zend_Cache_Core $cache */
         $cache = $this->cache;
-        $cacheName = __FUNCTION__ . '_' . md5($str);
+        $cacheName = __FUNCTION__ . '_' . md5($str . $withGroup);
 
         if (false === ($tags = $cache->load($cacheName))) {
             $inQuery = '?';
             if (is_array($groupId)) {
                 $inQuery = implode(',', array_fill(0, count($groupId), '?'));
             }
 
             $sql = "
-                SELECT t.* FROM tag t
+                SELECT t.*,case when tg.group_display_name IS NULL OR LENGTH(tg.group_display_name) = 0 then tg.group_name ELSE tg.group_display_name END AS group_name  FROM tag t
                 JOIN tag_group_item g on g.tag_id = t.tag_id
+                JOIN tag_group tg ON tg.group_id = g.tag_group_id
                 WHERE g.tag_group_id IN ($inQuery)
                 and is_active = 1
                 ORDER BY t.tag_fullname
                 ";
 
             $tagsList = $this->_db->query($sql, $groupId)->fetchAll();
+
+            if($withGroup) {
+                $tags['header'] = $tagsList[0]['group_name']; 
+            }
             
             foreach ($tagsList as $tag) {
-               $tags[$tag['tag_id']] = $tag['tag_fullname']; 
+                $tags[$tag['tag_id']] = $tag['tag_fullname']; 
             }
             
             if (count($tags) == 0) {
                 $tags = array();
             }
             $cache->save($tags, $cacheName, array(), 3600);
         }
         return $tags;
     }
     
     /**
      * @return array
      */
     public function fetchPackagetypeTagsAsJsonArray()
     {
         return $this->fetchForGroupAsJsonArray(Default_Model_DbTable_Tags::TAG_GROUP_PACKAGETYPE);
     }
     
     
     /**
      * @param int|array $groupId
      * @return array
      */
     public function fetchForGroupAsJsonArray($groupId)
     {
         $str = is_array($groupId) ? implode(',', $groupId) : $groupId;
         /** @var Zend_Cache_Core $cache */
         $cache = $this->cache;
         $cacheName = __FUNCTION__ . '_' . md5($str);
 
         if (false === ($tags = $cache->load($cacheName))) {
             $inQuery = '?';
             if (is_array($groupId)) {
                 $inQuery = implode(',', array_fill(0, count($groupId), '?'));
             }
 
             $sql = "
                 SELECT t.* FROM tag t
                 JOIN tag_group_item g on g.tag_id = t.tag_id
                 WHERE g.tag_group_id IN ($inQuery)
                 ORDER BY t.tag_fullname
                 ";
 
             $tagsList = $this->_db->query($sql, $groupId)->fetchAll();
             
             $tags = "{";
             $tags .= "'':'',"; 
             foreach ($tagsList as $tag) {
                $tags .= "'".$tag['tag_id']."':'" . $tag['tag_fullname']. "',"; 
             }
             $tags .= "}";
             
             $cache->save($tags, $cacheName, array(), 3600);
         }
         return $tags;
     }
     
     /**
      * @param int $projectId
      * @return array
      */
     public function fetchLicenseTagsForProject($projectId)
     {
         return $this->fetchTagsForProject($projectId, $this::TAG_GROUP_LICENSE);
     }
         
 
     /**
      * @param int $projectId
      * @return array
      */
     public function fetchArchitectureTagsForProject($projectId)
     {
         return $this->fetchTagsForProject($projectId, $this::TAG_GROUP_ARCHITECTURE);
     }
     
     /**
      * @param int $projectId
      * @return array
      */
     public function fetchPackagetypeTagsForProject($projectId)
     {
         return $this->fetchTagsForProject($projectId, $this::TAG_GROUP_PACKAGETYPE);
     }
     
     
 
     /**
      * @param int $projectId Description
      * @param int|array $groupId
      * @return array
      */
     public function fetchTagsForProject($projectId, $groupId)
     {
            $typeId = $this::TAG_TYPE_PROJECT;        
             $sql = "
                 SELECT `to`.*, t.tag_fullname FROM tag_object `to`
                 JOIN tag t on t.tag_id = to.tag_id
                 JOIN tag_group_item g on g.tag_id = t.tag_id 
                 WHERE g.tag_group_id = $groupId
                 and `to`.is_deleted = 0
                 and `to`.tag_type_id = $typeId 
                 and `to`.tag_object_id = $projectId
                 ";
             
             $tagsList = $this->_db->query($sql)->fetchAll();
             $tags = $tagsList;
             return $tags;
     }
 
     
     
 
 }
\ No newline at end of file
diff --git a/application/modules/default/views/helpers/FetchTagsForTagGroup.php b/application/modules/default/views/helpers/FetchTagsForTagGroup.php
index 6efc9d758..56ef4aa28 100644
--- a/application/modules/default/views/helpers/FetchTagsForTagGroup.php
+++ b/application/modules/default/views/helpers/FetchTagsForTagGroup.php
@@ -1,34 +1,42 @@
 <?php
 /**
  *  ocs-webserver
  *
  *  Copyright 2016 by pling GmbH.
  *
  *    This file is part of ocs-webserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    This program is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *    GNU Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
 class Default_View_Helper_FetchTagsForTagGroup extends Zend_View_Helper_Abstract
 {
 
-    public function fetchList($groupId)
+    public function fetchList($groupId, $withHeader = false)
     {
         
         $tableTags = new Default_Model_DbTable_Tags();
-        $tags = $tableTags->fetchForGroupForSelect($groupId);         
+        $tags = array();
+        if($withHeader) {
+            $tags = $tableTags->fetchForGroupForSelect($groupId, true);
+            $tags['header'] = 'Filter for: ' . $tags['header'];
+        } else {
+            $tags = $tableTags->fetchForGroupForSelect($groupId);
+        }
+        
+                 
         return $tags;
     }
     
 } 
\ No newline at end of file
diff --git a/application/modules/default/views/scripts/explore/index.phtml b/application/modules/default/views/scripts/explore/index.phtml
index 0b0a59772..b03eb48ca 100644
--- a/application/modules/default/views/scripts/explore/index.phtml
+++ b/application/modules/default/views/scripts/explore/index.phtml
@@ -1,302 +1,303 @@
 <?php
 /**
  *  ocs-webserver
  *
  *  Copyright 2016 by pling GmbH.
  *
  *    This file is part of ocs-webserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    This program is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *    GNU Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 $modelCategory = new Default_Model_DbTable_ProjectCategory();
 $this->dataCategory = $modelCategory->findSingleRow($this->cat_id);
 $store_config = Zend_Registry::get('store_config');
 $host = $store_config->host;
 $og_server = $this->serverUrl(true);
 $catTitle = '';
 if($this->dataCategory['project_category_id'])
 {
   $catTitle = $this->dataCategory['title'];
 }
 if($this->filters['order'] == 'latest'){
   $og_title = 'Browse '.$catTitle.' Latest | '.$host;
 }else if($this->filters['order'] == 'top'){
   $og_title = 'Browse '.$catTitle.' Top | '.$host;
 }else{
   $og_title='Browse '.$catTitle.' | '.$host;
 }
 $og_description = $og_title .'| A community for free and open source software and libre content';
 $this->templateConfigData = Zend_Registry::get('store_template');
 $og_image = 'https://' . $_SERVER['HTTP_HOST'] .$this->templateConfigData['logo'];
 $this->doctype(Zend_View_Helper_Doctype::XHTML1_RDFA);
 $this->headMeta()->appendProperty('og:type', 'website');
 $this->headMeta()->appendProperty('og:url', $og_server);
 $this->headMeta()->appendProperty('og:title', $og_title);
 $this->headMeta()->appendProperty('og:site_name',$host);
 $this->headMeta()->appendProperty('og:description',$og_description);
 $this->headMeta()->appendProperty('og:image',$og_image);
 
 
 $helperBuildExploreUrl = new Default_View_Helper_BuildExploreUrl();
 $modelInfo = new Default_Model_Info();
 
 $this->countSupporters = $modelInfo->getCountAllSupporters();
 $this->supporters = $modelInfo->getNewActiveSupporters(7);
 $this->headLink()->appendStylesheet('/theme/flatui/css/explore_index.css');
 
 
 if($this->inputFilterOriginal ==1)
 {
     $checkedOriginal = ' checked';
 }else
 {
    $checkedOriginal = '';
 }
 
 ?>
 
 <style>
 
   @media (max-width:720px){
 
     body > .panel.panel-default.pull-left {
       max-width: 100%;
       overflow-y: hidden;
     }
 
     #explore-content .GridFlex .content {
       padding-right: 15px;
       min-width: 400px;
     }
 
     #explore-content .GridFlex .sidebar-right {
       width: 400px;
       flex: none !important;
       margin: 0 auto;
     }
 
     #explore-content .GridFlex .content .explore-products {
       padding: 0 !important;
     }
 
     .explore-products .product-list .explore-product {
       position: relative;
       padding-left: 20px;
       padding-right: 50px;
     }
 
     .explore-products .product-list .explore-product > .col-xs-1 {
       position: absolute;
       top: 10px;
       left: 10px;
       padding: 0;
     }
 
     .explore-products .product-list .explore-product .explore-product-imgcolumn {
       width: 20%;
     }
 
     .explore-products .product-list .explore-product .explore-product-details {
       width: 80%;
     }
 
     .explore-products .product-list .explore-product .explore-product-plings {
       position: absolute;
       top: 10px;
       right: 0;
       width: 50px;
     }
 
     .explore-products .product-list .explore-product .explore-product-plings .rating {
       width: 100%;
     }
 
     .pling-nav-tabs ul.nav-tabs>li:last-child {
       float: right;
       padding: 10px;
       font-size: 12px;
     }
 
     #explore-content .sidebar-right-info .prod-widget-box {
       width: 100%;
     }
 
   }
 
   @media (max-width:611px){
     #explore-content .GridFlex .content {
       padding-right: 0;
       min-width: 100%;
     }
 
     #explore-content .GridFlex .sidebar-left {
       flex: none !important;
       width: 100%;
     }
 
     #explore-content .GridFlex .sidebar-right {
       flex: none !important;
       width: 100%;
       padding: 0;
     }
   }
   
   .filter_browse_tag_group {
       margin-right: 5px;
   }
 
 </style>
 
 <main id="explore-content">
     <section class="wrapper" id="products-wrapper">
     <span class="glyphicon  togglesidebar" id="btnTogglesidebar" ></span>
     <div class="GridFlex">
       <div class="GridFlex-cell sidebar-left" >
           <?php  $time_start = microtime(true);echo $this->render('explore/partials/filter.phtml'); $time_elapsed = microtime(true) - $time_start; ?>
           <?php if(Zend_Auth::getInstance()->hasIdentity() AND Zend_Auth::getInstance()->getIdentity()->roleName == 'admin') {
              echo '<div class="alert alert-warning" role="alert"><strong>Rendering Time: </strong>'.$time_elapsed.' s</div>';
           }?>
       </div>
       <div class="GridFlex-cell content">
         <section class="explore-products" id="explore-products">
 
             <div class="pling-nav-tabs">
               <ul class="nav nav-tabs pling-nav-tabs" id="sort">
                   <li  <?=$this->filters['order'] == 'latest' ? 'class="active"' :'' ?>>
                       <a href="<?= $helperBuildExploreUrl->buildExploreUrl($this->filters['category'], null,
                           'latest') ?>"><span><?= $this->translate('Latest') ?></span></a>
                   </li>
                   <li <?=$this->filters['order'] == 'top' ? 'class="active"' :'' ?>>
                       <a href="<?= $helperBuildExploreUrl->buildExploreUrl($this->filters['category'], null,
                           'top') ?>"><span><?= $this->translate('Top') ?></span></a>
                   </li>
                   <li style="float: right">
                       <input type="checkbox" name="filter_browse_original" value="1" id="filter_browse_original" <?=$checkedOriginal?> >  Original
                  
                   
                   <?php //Insert flexible tag-group-filter
                   $tagGroupFilter  = Zend_Registry::isRegistered('config_store_taggroups') ? Zend_Registry::get('config_store_taggroups') : null;
                   $tagGroupHelper = new Default_View_Helper_FetchTagsForTagGroup();
+                  
                   if(!empty($tagGroupFilter)) {
                       foreach ($tagGroupFilter as $tagGroup ) {
                           $tags = $tagGroupHelper->fetchList($tagGroup);
                           $select = $this->tag_group_filter[$tagGroup];
                           echo "<select id='tag_group_filter_".$tagGroup."' data_group_id='".$tagGroup."' class='filter_browse_tag_group'>";
                           echo "<option value=''></option>";
                           foreach (array_keys($tags) as $tag_id) {
                               if($select == $tag_id) {
                                   echo "<option value='".$tag_id."' selected>".$tags[$tag_id]."</option>";
                               } else {
                                   echo "<option value='".$tag_id."'>".$tags[$tag_id]."</option>";
                               }
                               
                           }
                           
                           echo "</select>";
                       }
                       
                       
                   }
                   ?>
                   </li> 
               </ul>
             </div>
 
               <div class="product-list">
                   <?php
                   if (count($this->products) == 0) {
                       echo '<div class="empty">No products to show in this category.</div>';
                   } else {
                        $time_start = microtime(true);
                        echo $this->render('explore/partials/products.phtml');
                        $time_elapsed = microtime(true) - $time_start;
                   }
                   ?>
                   <?php if(Zend_Auth::getInstance()->hasIdentity() AND Zend_Auth::getInstance()->getIdentity()->roleName == 'admin') {
                       echo '<div class="explore-product col-lg-12 col-md-12 col-sm-12 col-xs-12">';
                       echo '<div class="alert alert-warning" role="alert"><strong>Rendering Time: </strong>'.$time_elapsed.' s</div>';
                       echo '</div>';
                   }?>
               </div>
 
 
               <section class="explore-footer">
                   <?php echo $this->paginationControl($this->products, 'Sliding',
                       'explore/partials/paginationControl.phtml',
                       array('params' => $this->filters, 'dom_target' => 'section.explore-products')); ?>
               </section>
           </section>
       </div>
 
 <?php
 $time_start = microtime(true);
      $this->comments = $modelInfo->getLatestComments(5, $this->cat_id, $this->tags);
      //$donations = $modelInfo->getLatestPlings(5, $this->cat_id);
      $topprods = $modelInfo->getMostDownloaded(100, $this->cat_id, $this->tags);
      $asidehide = '';
      if(!$this->catabout && count($this->comments)==0  && count($topprods)==0 )
      {
         $asidehide = 'hide';
      }
      $this->show_git = false;
 ?>
       <div class="GridFlex-cell sidebar-right">
           <aside  id="explore-sidebar <?=$asidehide?>" >
              <?php
                 echo $this->render('/home/partials/common_rightsidebar.phtml');
             ?>
 
             <div  class="row sidebar-right-info" >
               <?php
               if (count($topprods) > 0) {
                   ?>
                   <span class="commentTitle"> Popularity <span class="small light"> (based on plings, downloads, etc.)</span></span>
 
                   <div class="prod-widget-box right bgwhite" id="mostdownloaded">
                       <?php
                       $this->rownum = 1;
                       foreach ($topprods as $this->product) {
                           echo $this->render('explore/partials/productTop.phtml');
                           $this->rownum++;
                       }
                       ?>
                   </div>
               <?php } ?>
 
             </div>
         </aside>
           <?php
           $time_elapsed = microtime(true) - $time_start;
           if(Zend_Auth::getInstance()->hasIdentity() AND Zend_Auth::getInstance()->getIdentity()->roleName == 'admin') {
               echo '<div class="alert alert-warning" role="alert"><strong>Rendering Time: </strong>'.$time_elapsed.' s</div>';
           }?>
       </div>
     </div>
     </section>
 
     <div class="tooltip_templates" style="display: none">
     <span id="tooltip_content">
         <i class="fa fa-spinner"></i>
     </span>
 </div>
 </main>
 
 <?php $this->inlineScript()->appendScript(
     '    $(document).ready(function(){
             TooltipUser.setup("tooltipuserleft","left");
             TooltipUser.setup("tooltipuser","right");
             FilterBrowseOriginalFn.setup();
             FilterBrowseTagGroupFn.setup();
         });
     ');