diff --git a/less/category.less b/less/category.less
index ab69767..58b78f6 100644
--- a/less/category.less
+++ b/less/category.less
@@ -109,6 +109,10 @@
 			font-weight: bold;
 		}
 	}
+
+	.subcategory {
+		margin-bottom: 10px;
+	}
 }
 
 .category, .categories, .subcategory {
diff --git a/templates/categories.tpl b/templates/categories.tpl
index f96a1b8..d1da411 100644
--- a/templates/categories.tpl
+++ b/templates/categories.tpl
@@ -12,6 +12,7 @@
 			<!-- IMPORT partials/categories/item.tpl -->
 			{{{end}}}
 		</ul>
+		<!-- IMPORT partials/paginator.tpl -->
 	</div>
 	<div data-widget-area="sidebar" class="col-lg-3 col-sm-12 <!-- IF !widgets.sidebar.length -->hidden<!-- ENDIF !widgets.sidebar.length -->">
 		{{{each widgets.sidebar}}}
diff --git a/templates/partials/category/subcategory.tpl b/templates/partials/category/subcategory.tpl
index 01cec9e..86fbfcd 100644
--- a/templates/partials/category/subcategory.tpl
+++ b/templates/partials/category/subcategory.tpl
@@ -1,9 +1,14 @@
+{{{ if children.length }}}
 <div class="subcategory">
-	<!-- IF children.length --><p>[[category:subcategories]]</p><!-- ENDIF children.length -->
+	<p>[[category:subcategories]]</p>
 
-	<ul class="categories" itemscope itemtype="http://www.schema.org/ItemList">
+	<ul component="category/subcategory/container" class="categories" itemscope itemtype="http://www.schema.org/ItemList">
 		{{{each children}}}
 		<!-- IMPORT partials/categories/item.tpl -->
 		{{{end}}}
 	</ul>
-</div>
\ No newline at end of file
+	{{{ if hasMoreSubCategories}}}
+	<button class="btn btn-default" component="category/load-more-subcategories">[[category:x-more-categories, {subCategoriesLeft}]]</button>
+	{{{ end }}}
+</div>
+{{{ end }}}
\ No newline at end of file
diff --git a/templates/search.tpl b/templates/search.tpl
index 46d150c..6f2ac42 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -48,9 +48,9 @@
 							<div class="row">
 								<div class="col-md-6">
 									<label>[[search:in-categories]]</label>
-									<select multiple class="form-control" id="posted-in-categories" size="{categoriesCount}">
-										{{{each categories}}}
-										<option value="{categories.value}">{categories.text}</option>
+									<select multiple class="form-control" id="posted-in-categories" size="{allCategoriesCount}">
+										{{{each allCategories}}}
+										<option value="{allCategories.value}">{allCategories.text}</option>
 										{{{end}}}
 									</select>
 									<input type="checkbox" id="search-children"> [[search:search-child-categories]]