diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a4ee67..3fe2b63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v3.0.6
+
+- Correct the url encoding to json_encode for none Latin languages.
+- Fix type cast validation on search page.
+
 # v3.0.5
 
 - Fix missing token variable in ajax call 
diff --git a/README.md b/README.md
index eddc65a..8a646de 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Get Bible (3.0.5)
+# Get Bible (3.0.6)
 
  ![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/master/admin/assets/images/vdm-component.jpg "GetBible")
 
@@ -18,8 +18,8 @@ In essence, The Bible for Joomla is designed to transform how the Word of God is
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Get Bible](https://getbible.net)
 + *First Build*: 3rd December, 2015
-+ *Last Build*: 7th March, 2024
-+ *Version*: 3.0.5
++ *Last Build*: 8th March, 2024
++ *Version*: 3.0.6
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -31,11 +31,11 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))
 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
 > never making one mistake or taking any coffee break.)
 
-+ *Line count*: **201763**
-+ *File count*: **1717**
++ *Line count*: **201789**
++ *File count*: **1718**
 + *Folder count*: **150**
 
-**371 Hours** or **47 Eight Hour Days** (the actual time the author spent)
+**372 Hours** or **47 Eight Hour Days** (the actual time the author spent)
 
 > (with the following break down:
 > **debugging @141hours** = codingtime / 4;
@@ -43,7 +43,7 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))
 > **mapping @56hours** = codingtime / 10;
 > **office @94hours** = codingtime / 6;)
 
-**934 Hours** or **117 Eight Hour Days**
+**935 Hours** or **117 Eight Hour Days**
 (a total of the realistic time frame for this project)
 
 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
diff --git a/admin/README.txt b/admin/README.txt
index eddc65a..8a646de 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -1,4 +1,4 @@
-# Get Bible (3.0.5)
+# Get Bible (3.0.6)
 
  ![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/master/admin/assets/images/vdm-component.jpg "GetBible")
 
@@ -18,8 +18,8 @@ In essence, The Bible for Joomla is designed to transform how the Word of God is
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Get Bible](https://getbible.net)
 + *First Build*: 3rd December, 2015
-+ *Last Build*: 7th March, 2024
-+ *Version*: 3.0.5
++ *Last Build*: 8th March, 2024
++ *Version*: 3.0.6
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -31,11 +31,11 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))
 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
 > never making one mistake or taking any coffee break.)
 
-+ *Line count*: **201763**
-+ *File count*: **1717**
++ *Line count*: **201789**
++ *File count*: **1718**
 + *Folder count*: **150**
 
-**371 Hours** or **47 Eight Hour Days** (the actual time the author spent)
+**372 Hours** or **47 Eight Hour Days** (the actual time the author spent)
 
 > (with the following break down:
 > **debugging @141hours** = codingtime / 4;
@@ -43,7 +43,7 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))
 > **mapping @56hours** = codingtime / 10;
 > **office @94hours** = codingtime / 6;)
 
-**934 Hours** or **117 Eight Hour Days**
+**935 Hours** or **117 Eight Hour Days**
 (a total of the realistic time frame for this project)
 
 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
diff --git a/admin/sql/updates/mysql/3.0.5.sql b/admin/sql/updates/mysql/3.0.5.sql
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/admin/sql/updates/mysql/3.0.5.sql
@@ -0,0 +1 @@
+
diff --git a/getbible.xml b/getbible.xml
index e2dca6a..281945a 100644
--- a/getbible.xml
+++ b/getbible.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.10" method="upgrade">
 	<name>COM_GETBIBLE</name>
-	<creationDate>7th March, 2024</creationDate>
+	<creationDate>8th March, 2024</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>https://getbible.net</authorUrl>
 	<copyright>Copyright (C) 2015. All Rights Reserved</copyright>
 	<license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license>
-	<version>3.0.5</version>
+	<version>3.0.6</version>
 	<description><![CDATA[
-		<h1>Get Bible (v.3.0.5)</h1>
+		<h1>Get Bible (v.3.0.6)</h1>
 		<div style="clear: both;"></div>
 		<p>Welcome to the next level of scripture engagement - The Bible for Joomla! Our purpose is to bring the Word of God to every person, in their native language, entirely free. This isn't just a typical extension; it's a groundbreaking tool developed to span language divides and deliver a rich, customizable Bible study experience to users worldwide.
 
diff --git a/script.php b/script.php
index 0fe8748..fcbb6ee 100644
--- a/script.php
+++ b/script.php
@@ -1546,7 +1546,7 @@ class Com_GetbibleInstallerScript
 			echo '<div style="background-color: #fff;" class="alert alert-info"><a target="_blank" href="https://getbible.net" title="Get Bible">
 				<img src="components/com_getbible/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 3.0.5 Was Successful! Let us know if anything is not working as expected.</h3></div>';
+				<h3>Upgrade to Version 3.0.6 Was Successful! Let us know if anything is not working as expected.</h3></div>';
 
 			// Set db if not set already.
 			if (!isset($db))
diff --git a/site/views/app/tmpl/default_getbibleapp.php b/site/views/app/tmpl/default_getbibleapp.php
index e369649..1954477 100644
--- a/site/views/app/tmpl/default_getbibleapp.php
+++ b/site/views/app/tmpl/default_getbibleapp.php
@@ -25,11 +25,11 @@ use Joomla\CMS\Layout\LayoutHelper;
 ?>
 <script type="text/javascript">
 // set global values
-const getbible_active_translation = '<?php echo $this->chapter->abbreviation; ?>';
+const getbible_active_translation = <?php echo json_encode($this->chapter->abbreviation); ?>;
 const getbible_verses = <?php echo json_encode($this->chapter->verses); ?>;
-const getbible_book_nr = <?php echo $this->chapter->book_nr; ?>;
-const getbible_chapter_nr = <?php echo $this->chapter->chapter; ?>;
-const getbible_page_url = '<?php echo $this->getBaseUrl(); ?>/';
+const getbible_book_nr = <?php echo (int) $this->chapter->book_nr; ?>;
+const getbible_chapter_nr = <?php echo (int) $this->chapter->chapter; ?>;
+const getbible_page_url = <?php echo json_encode($this->getBaseUrl() . '/'); ?>;
 var triggerGetBibleReload = false;
 </script>
 <div class="uk-section-default uk-section">
diff --git a/site/views/search/view.html.php b/site/views/search/view.html.php
index 7dd5c32..8f4842c 100644
--- a/site/views/search/view.html.php
+++ b/site/views/search/view.html.php
@@ -290,12 +290,13 @@ class GetbibleViewSearch extends HtmlView
 	 */
 	public function getReturnUrlBook(): int
 	{
-		if (empty($this->url_return_query))
+		if (empty($this->url_return_query) || !is_array($this->url_return_query))
 		{
 			$this->setReturnUrl();
 		}
 
-		return (int) $this->url_return_query['book'] ?? 0;
+		$book = $this->url_return_query['book'] ?? 0;
+		return (int) $book;
 	}
 
 	/**
@@ -306,12 +307,13 @@ class GetbibleViewSearch extends HtmlView
 	 */
 	public function getReturnUrlChapter(): int
 	{
-		if (empty($this->url_return_query))
+		if (empty($this->url_return_query) || !is_array($this->url_return_query))
 		{
 			$this->setReturnUrl();
 		}
 
-		return (int) $this->url_return_query['chapter'] ?? 0;
+		$chapter = $this->url_return_query['chapter'] ?? 0;
+		return (int) $chapter;
 	}
 
 	/**
diff --git a/update_server.xml b/update_server.xml
index cc8db15..0d6ae4a 100644
--- a/update_server.xml
+++ b/update_server.xml
@@ -647,4 +647,22 @@
 		<maintainerurl>https://getbible.net</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
+	<update>
+		<name>Get Bible</name>
+		<description>The Bible for Joomla</description>
+		<element>pkg_getbible</element>
+		<type>package</type>
+		<client>site</client>
+		<version>3.0.6</version>
+		<infourl title="Get Bible!">https://getbible.net</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v3.0.6.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>https://getbible.net</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
 </updates>
\ No newline at end of file