diff --git a/README.md b/README.md
index c24243f51..27646da62 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.12.5) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.12.6) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -143,11 +143,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 30th January, 2021
-+ *Version*: 2.12.5
++ *Last Build*: 2nd February, 2021
++ *Version*: 2.12.6
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **293015**
++ *Line count*: **293026**
 + *Field count*: **1611**
 + *File count*: **1934**
 + *Folder count*: **322**
diff --git a/admin/README.txt b/admin/README.txt
index c24243f51..27646da62 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.12.5) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.12.6) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -143,11 +143,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 30th January, 2021
-+ *Version*: 2.12.5
++ *Last Build*: 2nd February, 2021
++ *Version*: 2.12.6
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **293015**
++ *Line count*: **293026**
 + *Field count*: **1611**
 + *File count*: **1934**
 + *Folder count*: **322**
diff --git a/admin/models/forms/filter_joomla_components.xml b/admin/models/forms/filter_joomla_components.xml
index 236d3b07b..5ebfe18a2 100644
--- a/admin/models/forms/filter_joomla_components.xml
+++ b/admin/models/forms/filter_joomla_components.xml
@@ -56,7 +56,7 @@
 			label="COM_CONTENT_LIST_FULL_ORDERING"
 			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
 			onchange="this.form.submit();"
-			default="a.id DESC"
+			default="a.id desc"
 			validate="options"
 		>
 			<option value="">JGLOBAL_SORT_BY</option>
diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php
index a9c9b8774..aa28a40ab 100644
--- a/admin/models/joomla_components.php
+++ b/admin/models/joomla_components.php
@@ -2361,6 +2361,14 @@ class ComponentbuilderModelJoomla_components extends JModelList
 			$query->where('a.author IN (' . implode(',', $_author) . ')');
 		}
 
+		// Add the list ordering clause.
+		$orderCol = $this->state->get('list.ordering', 'a.id');
+		$orderDirn = $this->state->get('list.direction', 'desc');
+		if ($orderCol != '')
+		{
+			$query->order($db->escape($orderCol . ' ' . $orderDirn));
+		}
+
 		return $query;
 	}
 
@@ -2418,6 +2426,9 @@ class ComponentbuilderModelJoomla_components extends JModelList
 				$query->where('a.access IN (' . $groups . ')');
 			}
 
+			// Order the results by ordering
+			$query->order('a.id desc');
+
 			// Load the items
 			$db->setQuery($query);
 			$db->execute();
diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php
index b640ec733..0b40c1b50 100644
--- a/admin/views/joomla_components/view.html.php
+++ b/admin/views/joomla_components/view.html.php
@@ -40,7 +40,7 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy
 		$this->activeFilters = $this->get('ActiveFilters');
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
-		$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
+		$this->listDirn = $this->escape($this->state->get('list.direction', 'desc'));
 		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 1e6c880d0..f4140ab27 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>30th January, 2021</creationDate>
+	<creationDate>2nd February, 2021</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
 	<copyright>Copyright (C) 2015 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>2.12.5</version>
+	<version>2.12.6</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.12.5)</h1>
+		<h1>Component Builder (v.2.12.6)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
 
diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml
index b81b232a6..bcb188351 100644
--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@@ -1024,10 +1024,10 @@
 		<description>Builds Complex Joomla Components</description>
 		<element>com_componentbuilder</element>
 		<type>component</type>
-		<version>2.12.5</version>
+		<version>2.12.6</version>
 		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">http://domain.com/demo.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.12.6/JCB_v2.12.6.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
diff --git a/script.php b/script.php
index 612fe8a81..c18c09ed3 100644
--- a/script.php
+++ b/script.php
@@ -9250,7 +9250,7 @@ class com_componentbuilderInstallerScript
 			echo '<a target="_blank" href="http://www.joomlacomponentbuilder.com" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 2.12.5 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.12.6 Was Successful! Let us know if anything is not working as expected.</h3>';
 
 			// Set db if not set already.
 			if (!isset($db))