diff --git a/app/views/anime/details.php b/app/views/anime/details.php
index c019ad78..c915bee4 100644
--- a/app/views/anime/details.php
+++ b/app/views/anime/details.php
@@ -15,6 +15,11 @@ use function Aviat\AnimeClient\getLocalImg;
 					<td><?= $data['status'] ?></td>
 				</tr>
 
+				<tr>
+					<td>Show Type</td>
+					<td><?= (strlen($data['show_type']) > 3) ? ucfirst(strtolower($data['show_type'])) : $data['show_type'] ?></td>
+				</tr>
+
 				<?php if ($data['episode_count'] !== 1): ?>
 					<tr>
 						<td>Episode Count</td>
diff --git a/app/views/manga/details.php b/app/views/manga/details.php
index ab419814..060999a0 100644
--- a/app/views/manga/details.php
+++ b/app/views/manga/details.php
@@ -10,18 +10,22 @@
 					<td class="align-right">Publishing Status</td>
 					<td><?= $data['status'] ?></td>
 				</tr>
-				<?php /* <tr>
+				<tr>
 					<td>Manga Type</td>
-					<td><?= ucfirst($data['manga_type']) ?></td>
+					<td><?= ucfirst(strtolower($data['manga_type'])) ?></td>
 				</tr>
+				<?php if ( ! empty($data['volume_count'])): ?>
 				<tr>
 					<td>Volume Count</td>
 					<td><?= $data['volume_count'] ?></td>
 				</tr>
+				<?php endif ?>
+				<?php if ( ! empty($data['chapter_count'])): ?>
 				<tr>
 					<td>Chapter Count</td>
 					<td><?= $data['chapter_count'] ?></td>
-				</tr> */ ?>
+				</tr>
+				<?php endif ?>
 
 				<?php if ( ! empty($data['age_rating'])): ?>
 					<tr>
diff --git a/src/AnimeClient/API/Kitsu/GraphQL/Queries/AnimeDetails.graphql b/src/AnimeClient/API/Kitsu/GraphQL/Queries/AnimeDetails.graphql
index a96b7571..b9f7641f 100644
--- a/src/AnimeClient/API/Kitsu/GraphQL/Queries/AnimeDetails.graphql
+++ b/src/AnimeClient/API/Kitsu/GraphQL/Queries/AnimeDetails.graphql
@@ -107,7 +107,7 @@ query ($slug: String!) {
 			}
 		}
 		status
-		# subType
+		subtype
 		synopsis
 		titles {
 			canonical
diff --git a/src/AnimeClient/API/Kitsu/GraphQL/Queries/AnimeDetailsById.graphql b/src/AnimeClient/API/Kitsu/GraphQL/Queries/AnimeDetailsById.graphql
index 4e2a10e8..9fa1980a 100644
--- a/src/AnimeClient/API/Kitsu/GraphQL/Queries/AnimeDetailsById.graphql
+++ b/src/AnimeClient/API/Kitsu/GraphQL/Queries/AnimeDetailsById.graphql
@@ -107,7 +107,7 @@ query ($id: ID!) {
 			}
 		}
 		status
-		#subType
+		subtype
 		synopsis
 		titles {
 			canonical
diff --git a/src/AnimeClient/API/Kitsu/GraphQL/Queries/MangaDetails.graphql b/src/AnimeClient/API/Kitsu/GraphQL/Queries/MangaDetails.graphql
index 54602048..9a6f5500 100644
--- a/src/AnimeClient/API/Kitsu/GraphQL/Queries/MangaDetails.graphql
+++ b/src/AnimeClient/API/Kitsu/GraphQL/Queries/MangaDetails.graphql
@@ -22,8 +22,8 @@ query ($slug: String!) {
 				title
 			}
 		}
-		# chapterCount
-		# volumeCount
+		chapterCount
+		volumeCount
 		characters {
 			nodes {
 				character {
@@ -105,7 +105,7 @@ query ($slug: String!) {
 			}
 		}
 		status
-		#subType
+		subtype
 		synopsis
 		titles {
 			canonical
diff --git a/src/AnimeClient/API/Kitsu/GraphQL/Queries/MangaDetailsById.graphql b/src/AnimeClient/API/Kitsu/GraphQL/Queries/MangaDetailsById.graphql
index 1a14ebaa..89e97b6c 100644
--- a/src/AnimeClient/API/Kitsu/GraphQL/Queries/MangaDetailsById.graphql
+++ b/src/AnimeClient/API/Kitsu/GraphQL/Queries/MangaDetailsById.graphql
@@ -22,8 +22,8 @@ query ($id: ID!) {
 				title
 			}
 		}
-		# chapterCount
-		# volumeCount
+		chapterCount
+		volumeCount
 		characters {
 			nodes {
 				character {
@@ -105,7 +105,7 @@ query ($id: ID!) {
 			}
 		}
 		status
-		#subType
+		subtype
 		synopsis
 		titles {
 			canonical
diff --git a/src/AnimeClient/API/Kitsu/Transformer/AnimeTransformer.php b/src/AnimeClient/API/Kitsu/Transformer/AnimeTransformer.php
index fbf737ac..0d1fc290 100644
--- a/src/AnimeClient/API/Kitsu/Transformer/AnimeTransformer.php
+++ b/src/AnimeClient/API/Kitsu/Transformer/AnimeTransformer.php
@@ -36,7 +36,6 @@ final class AnimeTransformer extends AbstractTransformer {
 	{
 		// TODO: missing GraphQL data:
 		// * streaming links
-		// * show type
 
 		$base = array_key_exists('findAnimeBySlug', $item['data'])
 			? $item['data']['findAnimeBySlug']
@@ -114,7 +113,7 @@ final class AnimeTransformer extends AbstractTransformer {
 			'id' => $base['id'],
 			'slug' => $base['slug'],
 			'staff' => $staff,
-			'show_type' => 'TV', // $base['showType']
+			'show_type' => $base['subtype'],
 			'status' => Kitsu::getAiringStatus($base['startDate'], $base['endDate']),
 			'streaming_links' => [], // Kitsu::parseStreamingLinks($item['included']),
 			'synopsis' => $base['synopsis']['en'],
diff --git a/src/AnimeClient/API/Kitsu/Transformer/MangaTransformer.php b/src/AnimeClient/API/Kitsu/Transformer/MangaTransformer.php
index c5741f75..03aa692a 100644
--- a/src/AnimeClient/API/Kitsu/Transformer/MangaTransformer.php
+++ b/src/AnimeClient/API/Kitsu/Transformer/MangaTransformer.php
@@ -34,11 +34,6 @@ final class MangaTransformer extends AbstractTransformer {
 	 */
 	public function transform($item): MangaPage
 	{
-		// TODO: missing GraphQL data:
-		// * chapter count
-		// * volume count
-		// * manga type
-
 		$base = array_key_exists('findMangaBySlug', $item['data'])
 			? $item['data']['findMangaBySlug']
 			: $item['data']['findMangaById'];
@@ -108,11 +103,11 @@ final class MangaTransformer extends AbstractTransformer {
 			'age_rating' => $base['ageRating'],
 			'age_rating_guide' => $base['ageRatingGuide'],
 			'characters' => $characters,
-			// 'chapter_count' => $base['chapterCount'],
-			// 'volume_count' => $base['volumeCount'],
+			'chapter_count' => $base['chapterCount'],
+			'volume_count' => $base['volumeCount'],
 			'cover_image' => $base['posterImage']['views'][1]['url'],
 			'genres' => $genres,
-			// 'manga_type' => $base['subType'],
+			'manga_type' => $base['subtype'],
 			'id' => $base['id'],
 			'staff' => $staff,
 			'status' => Kitsu::getPublishingStatus($base['status'], $base['startDate'], $base['endDate']),