diff --git a/autoload_classmap.php b/autoload_classmap.php
index 59591ee..7acd70b 100644
--- a/autoload_classmap.php
+++ b/autoload_classmap.php
@@ -1,36 +1,62 @@
 <?php
 // Generated by ZF2's ./bin/classmap_generator.php
 return array(
-    'MamuzBlog\Controller\PostQueryController'        => __DIR__ . '/src/MamuzBlog/Controller/PostQueryController.php',
-    'MamuzBlog\Controller\PostQueryControllerFactory' =>
+    'MamuzBlog\Controller\AbstractQueryControllerFactory' =>
+    __DIR__ . '/src/MamuzBlog/Controller/AbstractQueryControllerFactory.php',
+    'MamuzBlog\Controller\Plugin\AbstractPlugin'          =>
+    __DIR__ . '/src/MamuzBlog/Controller/Plugin/AbstractPlugin.php',
+    'MamuzBlog\Controller\Plugin\RouteParam'              =>
+    __DIR__ . '/src/MamuzBlog/Controller/Plugin/RouteParam.php',
+    'MamuzBlog\Controller\Plugin\ViewModelFactory'        =>
+    __DIR__ . '/src/MamuzBlog/Controller/Plugin/ViewModelFactory.php',
+    'MamuzBlog\Controller\PostQueryController'            =>
+    __DIR__ . '/src/MamuzBlog/Controller/PostQueryController.php',
+    'MamuzBlog\Controller\PostQueryControllerFactory'     =>
     __DIR__ . '/src/MamuzBlog/Controller/PostQueryControllerFactory.php',
-    'MamuzBlog\Crypt\AdapterInterface'                => __DIR__ . '/src/MamuzBlog/Crypt/AdapterInterface.php',
-    'MamuzBlog\Crypt\HashIdAdapter'                   => __DIR__ . '/src/MamuzBlog/Crypt/HashIdAdapter.php',
-    'MamuzBlog\Crypt\HashIdAdapterFactory'            => __DIR__ . '/src/MamuzBlog/Crypt/HashIdAdapterFactory.php',
-    'MamuzBlog\DomainManager\Factory'                 => __DIR__ . '/src/MamuzBlog/DomainManager/Factory.php',
-    'MamuzBlog\DomainManager\ProviderInterface'       => __DIR__ . '/src/MamuzBlog/DomainManager/ProviderInterface.php',
-    'MamuzBlog\Entity\Post'                           => __DIR__ . '/src/MamuzBlog/Entity/Post.php',
-    'MamuzBlog\Entity\Tag'                            => __DIR__ . '/src/MamuzBlog/Entity/Tag.php',
-    'MamuzBlog\Feature\PostQueryInterface'            => __DIR__ . '/src/MamuzBlog/Feature/PostQueryInterface.php',
-    'MamuzBlog\Mapper\Db\PostQuery'                   => __DIR__ . '/src/MamuzBlog/Mapper/Db/PostQuery.php',
-    'MamuzBlog\Module'                                => __DIR__ . '/src/MamuzBlog/Module.php',
-    'MamuzBlog\Options\Constraint'                    => __DIR__ . '/src/MamuzBlog/Options/Constraint.php',
-    'MamuzBlog\Options\ConstraintInterface'           => __DIR__ . '/src/MamuzBlog/Options/ConstraintInterface.php',
-    'MamuzBlog\Options\PaginationConfigAwareTrait'    =>
-    __DIR__ . '/src/MamuzBlog/Options/PaginationConfigAwareTrait.php',
-    'MamuzBlog\Options\Range'                         => __DIR__ . '/src/MamuzBlog/Options/Range.php',
-    'MamuzBlog\Options\RangeInterface'                => __DIR__ . '/src/MamuzBlog/Options/RangeInterface.php',
-    'MamuzBlog\Service\PostQuery'                     => __DIR__ . '/src/MamuzBlog/Service/PostQuery.php',
-    'MamuzBlog\Service\PostQueryFactory'              => __DIR__ . '/src/MamuzBlog/Service/PostQueryFactory.php',
-    'MamuzBlog\View\Helper\AbstractHelper'            => __DIR__ . '/src/MamuzBlog/View/Helper/AbstractHelper.php',
-    'MamuzBlog\View\Helper\Anchor'                    => __DIR__ . '/src/MamuzBlog/View/Helper/Anchor.php',
-    'MamuzBlog\View\Helper\HashId'                    => __DIR__ . '/src/MamuzBlog/View/Helper/HashId.php',
-    'MamuzBlog\View\Helper\HashIdFactory'             => __DIR__ . '/src/MamuzBlog/View/Helper/HashIdFactory.php',
-    'MamuzBlog\View\Helper\Pager'                     => __DIR__ . '/src/MamuzBlog/View/Helper/Pager.php',
-    'MamuzBlog\View\Helper\PagerFactory'              => __DIR__ . '/src/MamuzBlog/View/Helper/PagerFactory.php',
-    'MamuzBlog\View\Helper\Panel'                     => __DIR__ . '/src/MamuzBlog/View/Helper/Panel.php',
-    'MamuzBlog\View\Helper\PostMeta'                  => __DIR__ . '/src/MamuzBlog/View/Helper/PostMeta.php',
-    'MamuzBlog\View\Helper\PostPanel'                 => __DIR__ . '/src/MamuzBlog/View/Helper/PostPanel.php',
-    'MamuzBlog\View\Helper\PostPanelShort'            => __DIR__ . '/src/MamuzBlog/View/Helper/PostPanelShort.php',
-    'MamuzBlog\View\Renderer\PhpRenderer'             => __DIR__ . '/src/MamuzBlog/View/Renderer/PhpRenderer.php',
+    'MamuzBlog\Controller\TagQueryController'             =>
+    __DIR__ . '/src/MamuzBlog/Controller/TagQueryController.php',
+    'MamuzBlog\Controller\TagQueryControllerFactory'      =>
+    __DIR__ . '/src/MamuzBlog/Controller/TagQueryControllerFactory.php',
+    'MamuzBlog\Crypt\AdapterInterface'                    => __DIR__ . '/src/MamuzBlog/Crypt/AdapterInterface.php',
+    'MamuzBlog\Crypt\HashIdAdapter'                       => __DIR__ . '/src/MamuzBlog/Crypt/HashIdAdapter.php',
+    'MamuzBlog\Crypt\HashIdAdapterFactory'                => __DIR__ . '/src/MamuzBlog/Crypt/HashIdAdapterFactory.php',
+    'MamuzBlog\DomainManager\Factory'                     => __DIR__ . '/src/MamuzBlog/DomainManager/Factory.php',
+    'MamuzBlog\DomainManager\ProviderInterface'           =>
+    __DIR__ . '/src/MamuzBlog/DomainManager/ProviderInterface.php',
+    'MamuzBlog\Entity\Post'                               => __DIR__ . '/src/MamuzBlog/Entity/Post.php',
+    'MamuzBlog\Entity\Tag'                                => __DIR__ . '/src/MamuzBlog/Entity/Tag.php',
+    'MamuzBlog\Feature\Pageable'                          => __DIR__ . '/src/MamuzBlog/Feature/Pageable.php',
+    'MamuzBlog\Feature\PostQueryInterface'                => __DIR__ . '/src/MamuzBlog/Feature/PostQueryInterface.php',
+    'MamuzBlog\Feature\TagQueryInterface'                 => __DIR__ . '/src/MamuzBlog/Feature/TagQueryInterface.php',
+    'MamuzBlog\Mapper\Db\AbstractQuery'                   => __DIR__ . '/src/MamuzBlog/Mapper/Db/AbstractQuery.php',
+    'MamuzBlog\Mapper\Db\PostQuery'                       => __DIR__ . '/src/MamuzBlog/Mapper/Db/PostQuery.php',
+    'MamuzBlog\Mapper\Db\TagQuery'                        => __DIR__ . '/src/MamuzBlog/Mapper/Db/TagQuery.php',
+    'MamuzBlog\Module'                                    => __DIR__ . '/src/MamuzBlog/Module.php',
+    'MamuzBlog\Options\Constraint'                        => __DIR__ . '/src/MamuzBlog/Options/Constraint.php',
+    'MamuzBlog\Options\ConstraintInterface'               => __DIR__ . '/src/MamuzBlog/Options/ConstraintInterface.php',
+    'MamuzBlog\Options\PaginationConfigProviderTrait'     =>
+    __DIR__ . '/src/MamuzBlog/Options/PaginationConfigProviderTrait.php',
+    'MamuzBlog\Options\Range'                             => __DIR__ . '/src/MamuzBlog/Options/Range.php',
+    'MamuzBlog\Options\RangeInterface'                    => __DIR__ . '/src/MamuzBlog/Options/RangeInterface.php',
+    'MamuzBlog\Service\AbstractQueryFactory'              =>
+    __DIR__ . '/src/MamuzBlog/Service/AbstractQueryFactory.php',
+    'MamuzBlog\Service\PostQuery'                         => __DIR__ . '/src/MamuzBlog/Service/PostQuery.php',
+    'MamuzBlog\Service\PostQueryFactory'                  => __DIR__ . '/src/MamuzBlog/Service/PostQueryFactory.php',
+    'MamuzBlog\Service\TagQuery'                          => __DIR__ . '/src/MamuzBlog/Service/TagQuery.php',
+    'MamuzBlog\Service\TagQueryFactory'                   => __DIR__ . '/src/MamuzBlog/Service/TagQueryFactory.php',
+    'MamuzBlog\View\Helper\AbstractHelper'                => __DIR__ . '/src/MamuzBlog/View/Helper/AbstractHelper.php',
+    'MamuzBlog\View\Helper\AbstractPagerFactory'          =>
+    __DIR__ . '/src/MamuzBlog/View/Helper/AbstractPagerFactory.php',
+    'MamuzBlog\View\Helper\Anchor'                        => __DIR__ . '/src/MamuzBlog/View/Helper/Anchor.php',
+    'MamuzBlog\View\Helper\HashId'                        => __DIR__ . '/src/MamuzBlog/View/Helper/HashId.php',
+    'MamuzBlog\View\Helper\HashIdFactory'                 => __DIR__ . '/src/MamuzBlog/View/Helper/HashIdFactory.php',
+    'MamuzBlog\View\Helper\Pager'                         => __DIR__ . '/src/MamuzBlog/View/Helper/Pager.php',
+    'MamuzBlog\View\Helper\Panel'                         => __DIR__ . '/src/MamuzBlog/View/Helper/Panel.php',
+    'MamuzBlog\View\Helper\PostMeta'                      => __DIR__ . '/src/MamuzBlog/View/Helper/PostMeta.php',
+    'MamuzBlog\View\Helper\PostPagerFactory'              =>
+    __DIR__ . '/src/MamuzBlog/View/Helper/PostPagerFactory.php',
+    'MamuzBlog\View\Helper\PostPanel'                     => __DIR__ . '/src/MamuzBlog/View/Helper/PostPanel.php',
+    'MamuzBlog\View\Helper\PostPanelShort'                => __DIR__ . '/src/MamuzBlog/View/Helper/PostPanelShort.php',
+    'MamuzBlog\View\Helper\TagPagerFactory'               => __DIR__ . '/src/MamuzBlog/View/Helper/TagPagerFactory.php',
+    'MamuzBlog\View\Renderer\PhpRenderer'                 => __DIR__ . '/src/MamuzBlog/View/Renderer/PhpRenderer.php',
 );
diff --git a/template_map.php b/template_map.php
index 2d118f1..8676472 100644
--- a/template_map.php
+++ b/template_map.php
@@ -3,4 +3,5 @@
 return array(
     'mamuz-blog/post-query/active-posts' => __DIR__ . '/view/mamuz-blog/post-query/active-posts.phtml',
     'mamuz-blog/post-query/active-post'  => __DIR__ . '/view/mamuz-blog/post-query/active-post.phtml',
+    'mamuz-blog/tag-query/list'          => __DIR__ . '/view/mamuz-blog/tag-query/list.phtml',
 );