diff --git a/controllers/ManageTags.php b/controllers/ManageTags.php
index 0e00cb19..bd561d79 100644
--- a/controllers/ManageTags.php
+++ b/controllers/ManageTags.php
@@ -53,9 +53,9 @@ class ManageTags extends HTMLController
 			'sort_direction' => !empty($_GET['dir']) ? $_GET['dir'] : null,
 			'title' => 'Manage tags',
 			'no_items_label' => 'No tags meet the requirements of the current filter.',
-			'items_per_page' => 25,
+			'items_per_page' => 30,
 			'base_url' => BASEURL . '/managetags/',
-			'get_data' => function($offset = 0, $limit = 15, $order = '', $direction = 'up') {
+			'get_data' => function($offset = 0, $limit = 30, $order = '', $direction = 'up') {
 				if (!in_array($order, ['id_post', 'tag', 'slug', 'kind', 'count']))
 					$order = 'tag';
 				if (!in_array($direction, ['up', 'down']))
@@ -64,12 +64,14 @@ class ManageTags extends HTMLController
 				$data = Registry::get('db')->queryAssocs('
 					SELECT *
 					FROM tags
+					WHERE kind != {string:album}
 					ORDER BY {raw:order}
 					LIMIT {int:offset}, {int:limit}',
 					[
 						'order' => $order . ($direction == 'up' ? ' ASC' : ' DESC'),
 						'offset' => $offset,
 						'limit' => $limit,
+						'album' => 'Album',
 					]);
 
 				return [
@@ -81,7 +83,9 @@ class ManageTags extends HTMLController
 			'get_count' => function() {
 				return Registry::get('db')->queryValue('
 					SELECT COUNT(*)
-					FROM tags');
+					FROM tags
+					WHERE kind != {string:album}',
+					['album' => 'Album']);
 			}
 		];