diff --git a/public_html/components/com_jed/models/extension.php b/public_html/components/com_jed/models/extension.php
index 933f12fa0..f1a8834ea 100644
--- a/public_html/components/com_jed/models/extension.php
+++ b/public_html/components/com_jed/models/extension.php
@@ -11,6 +11,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\Object\CMSObject;
 
 /**
  * Extension model.
@@ -21,15 +22,15 @@
 class JedModelExtension extends BaseDatabaseModel
 {
 	/**
-	 * Function to get a specific extension.
+	 * Method to get a specific extension.
 	 *
-	 * @param   integer  $pk  The ID of the item
+	 * @param   integer  $pk  The id of the primary key.
 	 *
-	 * @return stdClass|mixed The data
-	 * @since 4.0.0
-	 * @throws Exception If the ID is not found
+	 * @return  CMSObject  Object with item details.
+	 *
+	 * @since   4.0.0
 	 */
-	public function getItem($pk = null)
+	public function getItem($pk = null): CMSObject
 	{
 		$pk    = $pk ?: $this->getState('extension.id');
 		$db    = $this->getDbo();
@@ -115,13 +116,33 @@ public function getItem($pk = null)
 		$extension->phpVersion        = $this->getPhpVersions($extension->id);
 		$extension->joomlaVersion     = $this->getJoomlaVersions($extension->id);
 
-		// Get other extensions from this developer
-		/** @var JedModelExtensions $extensionsModel */
-		$extensionsModel = BaseDatabaseModel::getInstance('Extensions', 'JedModel', array('ignore_request' => true));
-		$extensionsModel->setState('filter.developer', $extension->developerId);
-		$extensionsModel->setState('filter.extensionId', $extension->id);
-		$extensionsModel->setState('filter.extensionId.include', false);
-		$extension->otherExtensions = $extensionsModel->getItems();
+		// Collect extensions retrieved to exclude
+		$excludeIds = [$extension->id];
+
+		// Get other extensions by same developer
+		$extension->otherExtensions = $this->getExtensions($excludeIds, 100, 'developer', $extension->developerId);
+
+		foreach ($extension->otherExtensions as $otherExtension)
+		{
+			$excludeIds[] = $otherExtension->id;
+		}
+
+		// Get related extensions from same category
+		$extension->relatedExtensions = $this->getExtensions($excludeIds, 3, 'category', $extension->categoryId);
+
+		foreach ($extension->relatedExtensions as $relatedExtension)
+		{
+			$excludeIds[] = $relatedExtension->id;
+		}
+
+		// Get other related if we don't have 3 items yet
+		if (count($extension->relatedExtensions) < 3)
+		{
+			$extension->relatedExtensions = array_merge(
+				$extension->relatedExtensions,
+				$this->getExtensions($excludeIds, 3 - count($extension->relatedExtensions))
+			);
+		}
 
 		return $extension;
 	}
@@ -246,4 +267,33 @@ public function getPhpVersions(int $extensionId): array
 		return $db->loadColumn();
 	}
 
+	/**
+	 * Get extensions based on quick filters
+	 *
+	 * @param   array   $excludeIds  Array of IDs to exclude
+	 * @param   int     $limit       Limit items retrieved
+	 * @param   string  $filterType  Filter type (developer|category)
+	 * @param   int     $filterId    ID to filter for
+	 *
+	 * @return array
+	 *
+	 * @since 4.0.0
+	 */
+	public function getExtensions(array $excludeIds, int $limit = 100, string $filterType = '', int $filterId = 0): array
+	{
+		/** @var JedModelExtensions $extensionsModel */
+		$extensionsModel = BaseDatabaseModel::getInstance('Extensions', 'JedModel', array('ignore_request' => true));
+
+		if ($filterType && $filterId)
+		{
+			$extensionsModel->setState('filter.' . $filterType, $filterId);
+		}
+
+		$extensionsModel->setState('filter.extensionId', $excludeIds);
+		$extensionsModel->setState('filter.extensionId.include', false);
+		$extensionsModel->setState('list.limit', $limit);
+		$extensionsModel->setState('list.ordering', Factory::getDbo()->getQuery(true)->Rand());
+
+		return $extensionsModel->getItems();
+	}
 }
diff --git a/public_html/components/com_jed/models/extensions.php b/public_html/components/com_jed/models/extensions.php
index 3fa3db287..da03ecfbe 100644
--- a/public_html/components/com_jed/models/extensions.php
+++ b/public_html/components/com_jed/models/extensions.php
@@ -121,10 +121,9 @@ protected function getListQuery(): \JDatabaseQuery
 
 		if ($category)
 		{
-
+			$query->where('extensions.category_id = ' . (int) $category);
 		}
 
-		// Filter by a single or group of articles.
 		$extensionId = $this->getState('filter.extensionId');
 
 		if (is_numeric($extensionId))
@@ -189,6 +188,8 @@ protected function getListQuery(): \JDatabaseQuery
 			$query->where($db->quoteName('extensions.created_by') . ' = ' . (int) $developer);
 		}
 
+		$query->order($this->getState('list.ordering', 'extensions.ordering') . ' ' . $this->getState('list.direction', 'ASC'));
+
 		return $query;
 	}
 
@@ -211,6 +212,7 @@ public function getItems()
 			{
 				$item->intro = HTMLHelper::_('string.truncate', $item->body, 150, true, false);
 			}
+
 			unset($item->body);
 
 			// Format the image
diff --git a/public_html/components/com_jed/views/extension/tmpl/default.php b/public_html/components/com_jed/views/extension/tmpl/default.php
index e40a5dfda..0c6dc7e74 100644
--- a/public_html/components/com_jed/views/extension/tmpl/default.php
+++ b/public_html/components/com_jed/views/extension/tmpl/default.php
@@ -16,174 +16,174 @@
 /** @var JedViewExtension $this */
 ?>
 
-<div class="jed-wrapper jed-extension-header">
-	<div class="jed-container">
-		<div class="jed-extension-header__content">
-			<div class="jed-extension-header__item">
-				<h1 class="heading heading--xl"><?php echo $this->item->title; ?></h1>
-				<div class="jed-extension-header__info">
-					<div class="jed-extension-header__developer">By
-						<a href="#"><?php echo $this->item->developer; ?></a></div>
-					<div class="stars-wrapper">
-						<?php echo LayoutHelper::render('elements.stars', ['score' => $this->item->score]); ?>
-						<a href="#reviews"><?php echo $this->item->reviews; ?> reviews</a>
+	<div class="jed-wrapper jed-extension-header">
+		<div class="jed-container">
+			<div class="jed-extension-header__content">
+				<div class="jed-extension-header__item">
+					<h1 class="heading heading--xl"><?php echo $this->item->title; ?></h1>
+					<div class="jed-extension-header__info">
+						<div class="jed-extension-header__developer">By
+							<a href="#"><?php echo $this->item->developer; ?></a></div>
+						<div class="stars-wrapper">
+							<?php echo LayoutHelper::render('elements.stars', ['score' => $this->item->score]); ?>
+							<a href="#reviews"><?php echo $this->item->reviews; ?> reviews</a>
+						</div>
 					</div>
 				</div>
-			</div>
-			<div class="jed-extension-header__item">
-				<div class="jed-extension-header__buttons button-group">
-					<?php if ($this->item->homepageLink): ?>
-						<a href="<?php echo $this->item->homepageLink; ?>" class="button button--blue button--big">Get extension</a>
-					<?php endif; ?>
+				<div class="jed-extension-header__item">
+					<div class="jed-extension-header__buttons button-group">
+						<?php if ($this->item->homepageLink): ?>
+							<a href="<?php echo $this->item->homepageLink; ?>" class="button button--blue button--big">Get extension</a>
+						<?php endif; ?>
 
-					<a href="#" class="button button--blue button--big button--icon-only">
-						<span aria-hidden="true" class="icon-heart-2"></span>
-						<span class="visually-hidden">Favourite</span>
-					</a>
+						<a href="#" class="button button--blue button--big button--icon-only">
+							<span aria-hidden="true" class="icon-heart-2"></span>
+							<span class="visually-hidden">Favourite</span>
+						</a>
+					</div>
 				</div>
 			</div>
+			<ul class="tabs">
+				<li class="tab is-active">
+					<a href="#">Free</a>
+				</li>
+				<li class="tab">
+					<a href="#">Paid</a>
+				</li>
+				<li class="tab">
+					<a href="#">Cloud</a>
+				</li>
+			</ul>
 		</div>
-		<ul class="tabs">
-			<li class="tab is-active">
-				<a href="#">Free</a>
-			</li>
-			<li class="tab">
-				<a href="#">Paid</a>
-			</li>
-			<li class="tab">
-				<a href="#">Cloud</a>
-			</li>
-		</ul>
 	</div>
-</div>
 
-<div class="jed-wrapper jed-extension margin-bottom">
-	<div class="jed-container">
-		<div class="jed-extension__image">
-			<div class="image-placeholder">
-				<?php if ($this->item->image): ?>
-					<img src="<?php echo JedHelper::formatImage($this->item->image, 'large'); ?>" alt="<?php echo $this->item->title; ?>"/>
-				<?php endif; ?>
-			</div>
-		</div>
-		<div class="jed-grid jed-grid--2-1 margin-bottom">
-			<div class="jed-grid__item">
-				<p class="extension-tags font-size-s">
-					<span aria-hidden="true" class="icon-tag"></span>
-					<a href="<?php echo Route::_('index.php?option=com_jed&view=extensions&category=' . $this->item->categoryId); ?>"><?php echo $this->item->category; ?></a>,
-					<?php foreach ($this->item->relatedCategories as $category): ?>
-						<a href="<?php echo Route::_('index.php?option=com_jed&view=extensions&category=' . $category->id); ?>"><?php echo $category->title; ?></a>,
-					<?php endforeach; ?>
-				</p>
-				<p class="font-size-xl">
-					<?php echo $this->item->intro; ?>
-				</p>
-				<p class="button-group">
-					<?php if ($this->item->downloadLink): ?>
-						<a href="<?php echo $this->item->downloadLink; ?>" class="button button--grey">Download</a>
-					<?php endif; ?>
-					<?php if ($this->item->demoLink): ?>
-						<a href="<?php echo $this->item->demoLink; ?>" class="button button--grey">Demo</a>
-					<?php endif; ?>
-					<?php if ($this->item->documentationLink): ?>
-						<a href="<?php echo $this->item->documentationLink; ?>" class="button button--grey">Documentation</a>
-					<?php endif; ?>
-					<?php if ($this->item->supportLink): ?>
-						<a href="<?php echo $this->item->supportLink; ?>" class="button button--grey">Support</a>
-					<?php endif; ?>
-					<?php if ($this->item->licenseLink): ?>
-						<a href="<?php echo $this->item->licenseLink; ?>" class="button button--grey">License</a>
-					<?php endif; ?>
-					<?php if ($this->item->translationLink): ?>
-						<a href="<?php echo $this->item->translationLink; ?>" class="button button--grey">Translation</a>
+	<div class="jed-wrapper jed-extension margin-bottom">
+		<div class="jed-container">
+			<div class="jed-extension__image">
+				<div class="image-placeholder">
+					<?php if ($this->item->image): ?>
+						<img src="<?php echo JedHelper::formatImage($this->item->image, 'large'); ?>" alt="<?php echo $this->item->title; ?>"/>
 					<?php endif; ?>
-				</p>
-			</div>
-			<div class="jed-grid__item">
-				<p>
-                    <span class="button-group display-block align-right">
-                        <a href="#" class="button button--grey">Report</a>
-                        <a href="#" class="button button--grey">Share</a>
-                    </span>
-				</p>
-				<dl class="deflist">
-					<div>
-						<dt>Version</dt>
-						<dd><?php echo $this->item->version; ?></dd>
-					</div>
-					<div>
-						<dt>Last updated</dt>
-						<dd><?php echo HTMLHelper::_('date', $this->item->updated, Text::_('F d, Y')); ?></dd>
-					</div>
-					<div>
-						<dt>Date added</dt>
-						<dd><?php echo HTMLHelper::_('date', $this->item->added, Text::_('F d, Y')); ?></dd>
-					</div>
-					<div>
-						<dt>Includes</dt>
-						<dd><?php echo implode(', ', array_map('ucfirst', $this->item->extensionTypes)); ?></dd>
-					</div>
-					<div>
-						<dt>Joomla! version(s)</dt>
-						<dd><?php echo implode(', ', $this->item->joomlaVersion); ?></dd>
-					</div>
-					<div>
-						<dt>PHP version(s)</dt>
-						<dd><?php echo implode(', ', $this->item->phpVersion); ?></dd>
-					</div>
-				</dl>
-			</div>
-		</div>
-		<div class="jed-grid jed-grid--1-1-1 margin-bottom-half">
-			<div class="jed-grid__item">
-				<div class="image-placeholder"></div>
-			</div>
-			<div class="jed-grid__item">
-				<div class="image-placeholder"></div>
+				</div>
 			</div>
-			<div class="jed-grid__item">
-				<div class="image-placeholder"></div>
+			<div class="jed-grid jed-grid--2-1 margin-bottom">
+				<div class="jed-grid__item">
+					<p class="extension-tags font-size-s">
+						<span aria-hidden="true" class="icon-tag"></span>
+						<a href="<?php echo Route::_('index.php?option=com_jed&view=extensions&category=' . $this->item->categoryId); ?>"><?php echo $this->item->category; ?></a>,
+						<?php foreach ($this->item->relatedCategories as $category): ?>
+							<a href="<?php echo Route::_('index.php?option=com_jed&view=extensions&category=' . $category->id); ?>"><?php echo $category->title; ?></a>,
+						<?php endforeach; ?>
+					</p>
+					<p class="font-size-xl">
+						<?php echo $this->item->intro; ?>
+					</p>
+					<p class="button-group">
+						<?php if ($this->item->downloadLink): ?>
+							<a href="<?php echo $this->item->downloadLink; ?>" class="button button--grey">Download</a>
+						<?php endif; ?>
+						<?php if ($this->item->demoLink): ?>
+							<a href="<?php echo $this->item->demoLink; ?>" class="button button--grey">Demo</a>
+						<?php endif; ?>
+						<?php if ($this->item->documentationLink): ?>
+							<a href="<?php echo $this->item->documentationLink; ?>" class="button button--grey">Documentation</a>
+						<?php endif; ?>
+						<?php if ($this->item->supportLink): ?>
+							<a href="<?php echo $this->item->supportLink; ?>" class="button button--grey">Support</a>
+						<?php endif; ?>
+						<?php if ($this->item->licenseLink): ?>
+							<a href="<?php echo $this->item->licenseLink; ?>" class="button button--grey">License</a>
+						<?php endif; ?>
+						<?php if ($this->item->translationLink): ?>
+							<a href="<?php echo $this->item->translationLink; ?>" class="button button--grey">Translation</a>
+						<?php endif; ?>
+					</p>
+				</div>
+				<div class="jed-grid__item">
+					<p>
+						<span class="button-group display-block align-right">
+							<a href="#" class="button button--grey">Report</a>
+							<a href="#" class="button button--grey">Share</a>
+						</span>
+					</p>
+					<dl class="deflist">
+						<div>
+							<dt>Version</dt>
+							<dd><?php echo $this->item->version; ?></dd>
+						</div>
+						<div>
+							<dt>Last updated</dt>
+							<dd><?php echo HTMLHelper::_('date', $this->item->updated, Text::_('F d, Y')); ?></dd>
+						</div>
+						<div>
+							<dt>Date added</dt>
+							<dd><?php echo HTMLHelper::_('date', $this->item->added, Text::_('F d, Y')); ?></dd>
+						</div>
+						<div>
+							<dt>Includes</dt>
+							<dd><?php echo implode(', ', array_map('ucfirst', $this->item->extensionTypes)); ?></dd>
+						</div>
+						<div>
+							<dt>Joomla! version(s)</dt>
+							<dd><?php echo implode(', ', $this->item->joomlaVersion); ?></dd>
+						</div>
+						<div>
+							<dt>PHP version(s)</dt>
+							<dd><?php echo implode(', ', $this->item->phpVersion); ?></dd>
+						</div>
+					</dl>
+				</div>
 			</div>
-		</div>
-		<div class="jed-grid jed-grid--2-1 margin-bottom">
-			<div class="jed-grid__item">
-				<h2 class="heading heading--m">Description</h2>
-				<?php
-				// @TODO Parse markdown, show part of text after read all
-				echo HTMLHelper::_('string.truncate', $this->item->body, 1000, true);
-				?>
-				<p><a href="#">Read all</a></p>
+			<div class="jed-grid jed-grid--1-1-1 margin-bottom-half">
+				<div class="jed-grid__item">
+					<div class="image-placeholder"></div>
+				</div>
+				<div class="jed-grid__item">
+					<div class="image-placeholder"></div>
+				</div>
+				<div class="jed-grid__item">
+					<div class="image-placeholder"></div>
+				</div>
 			</div>
-			<div class="jed-grid__item"></div>
-		</div>
-		<div class="jed-grid jed-grid--1-2" id="reviews">
-			<div class="jed-grid__item">
-				<h2 class="heading heading--m">Reviews for free version</h2>
-				<strong><?php echo $this->item->score / 10; ?></strong>
-				<?php echo LayoutHelper::render('elements.stars', ['score' => $this->item->score]); ?>
-				<a href="#"><?php echo $this->item->reviews; ?> reviews</a>
+			<div class="jed-grid jed-grid--2-1 margin-bottom">
+				<div class="jed-grid__item">
+					<h2 class="heading heading--m">Description</h2>
+					<?php
+					// @TODO Parse markdown, show part of text after read all
+					echo HTMLHelper::_('string.truncate', $this->item->body, 1000, true);
+					?>
+					<p><a href="#">Read all</a></p>
+				</div>
+				<div class="jed-grid__item"></div>
 			</div>
-			<div class="jed-grid__item">
-				<h2 class="heading heading--m">Most valuable reviews</h2>
-				<div class="review">
-					<h3>Powerful and useful extension</h3>
-					<p>Rating</p>
-					<p>Positives & negatives</p>
-					<p>Description</p>
-					<p>Author</p>
+			<div class="jed-grid jed-grid--1-2" id="reviews">
+				<div class="jed-grid__item">
+					<h2 class="heading heading--m">Reviews for free version</h2>
+					<strong><?php echo $this->item->score / 10; ?></strong>
+					<?php echo LayoutHelper::render('elements.stars', ['score' => $this->item->score]); ?>
+					<a href="#"><?php echo $this->item->reviews; ?> reviews</a>
 				</div>
-				<div class="review">
-					<h3>Powerful and useful extension</h3>
-					<p>Rating</p>
-					<p>Positives & negatives</p>
-					<p>Description</p>
-					<p>Author</p>
+				<div class="jed-grid__item">
+					<h2 class="heading heading--m">Most valuable reviews</h2>
+					<div class="review">
+						<h3>Powerful and useful extension</h3>
+						<p>Rating</p>
+						<p>Positives & negatives</p>
+						<p>Description</p>
+						<p>Author</p>
+					</div>
+					<div class="review">
+						<h3>Powerful and useful extension</h3>
+						<p>Rating</p>
+						<p>Positives & negatives</p>
+						<p>Description</p>
+						<p>Author</p>
+					</div>
+					<p><a href="#">All reviews</a></p>
 				</div>
-				<p><a href="#">All reviews</a></p>
 			</div>
 		</div>
 	</div>
-</div>
 
 <?php if ($this->item->otherExtensions): ?>
 	<div class="jed-cards-wrapper margin-bottom-half">
@@ -209,24 +209,26 @@
 	</div>
 <?php endif; ?>
 
-<div class="jed-cards-wrapper margin-bottom-half">
-	<div class="jed-container">
-		<h2 class="heading heading--m">You might also be interested in</h2>
-		<ul class="jed-grid jed-grid--1-1-1">
-			<?php for ($i = 0; $i < 3; $i++): ?>
-				<?php echo LayoutHelper::render('cards.extension', [
-					'image'         => 'https://extensionscdn.joomla.org/cache/fab_image/596c962509d22_resizeDown400px175px16.jpg',
-					'title'         => 'Akeeba Backup',
-					'developer'     => 'Akeeba Ltd',
-					'score'         => 99,
-					'reviews'       => 1061,
-					'compatibility' => ['3', '4 alpha'],
-					'description'   => 'Akeeba Backup Core is the most widely used open-source backup component for the Joomla! CMS. Its mission is simple: create a site backup that can be restored on any Joomla!-capable server.',
-					'type'          => 'Free',
-					'category'      => 'Site Security',
-					'link'          => '#'
-				]); ?>
-			<?php endfor; ?>
-		</ul>
+<?php if ($this->item->relatedExtensions): ?>
+	<div class="jed-cards-wrapper margin-bottom-half">
+		<div class="jed-container">
+			<h2 class="heading heading--m">You might also be interested in</h2>
+			<ul class="jed-grid jed-grid--1-1-1">
+				<?php foreach ($this->item->relatedExtensions as $item): ?>
+					<?php echo LayoutHelper::render('cards.extension', [
+						'image'         => $item->image,
+						'title'         => $item->title,
+						'developer'     => $item->developer,
+						'score'         => $item->score,
+						'reviews'       => $item->reviews,
+						'compatibility' => $item->compatibility,
+						'description'   => $item->intro,
+						'type'          => $item->type,
+						'category'      => $item->category,
+						'link'          => Route::_('index.php?option=com_jed&view=extension&id=' . $item->id)
+					]); ?>
+				<?php endforeach; ?>
+			</ul>
+		</div>
 	</div>
-</div>
+<?php endif; ?>
\ No newline at end of file