diff --git a/admin/assets/css/language_translation.css b/admin/assets/css/language_translation.css
index 87081ef1f..a7b8a873e 100644
--- a/admin/assets/css/language_translation.css
+++ b/admin/assets/css/language_translation.css
@@ -9,7 +9,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 29 of this MVC
+	@version		@update number 30 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/assets/css/language_translations.css b/admin/assets/css/language_translations.css
index 719d28c16..74b2e4ffe 100644
--- a/admin/assets/css/language_translations.css
+++ b/admin/assets/css/language_translations.css
@@ -9,7 +9,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 29 of this MVC
+	@version		@update number 30 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/controllers/language_translation.php b/admin/controllers/language_translation.php
index b107c2849..9c19c7d96 100644
--- a/admin/controllers/language_translation.php
+++ b/admin/controllers/language_translation.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 29 of this MVC
+	@version		@update number 30 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/controllers/language_translations.php b/admin/controllers/language_translations.php
index 25a04cc34..0cf293052 100644
--- a/admin/controllers/language_translations.php
+++ b/admin/controllers/language_translations.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 29 of this MVC
+	@version		@update number 30 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/models/forms/language_translation.js b/admin/models/forms/language_translation.js
index c4d782c77..a854ef03d 100644
--- a/admin/models/forms/language_translation.js
+++ b/admin/models/forms/language_translation.js
@@ -9,7 +9,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 29 of this MVC
+	@version		@update number 30 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/models/language_translation.php b/admin/models/language_translation.php
index 03307551c..0133a41a0 100644
--- a/admin/models/language_translation.php
+++ b/admin/models/language_translation.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 29 of this MVC
+	@version		@update number 30 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/models/language_translations.php b/admin/models/language_translations.php
index d73758db5..f7852c968 100644
--- a/admin/models/language_translations.php
+++ b/admin/models/language_translations.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 29 of this MVC
+	@version		@update number 30 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
@@ -181,7 +181,7 @@ class ComponentbuilderModelLanguage_translations extends JModelList
 			else
 			{
 				$search = $db->quote('%' . $db->escape($search) . '%');
-				$query->where('(a.entranslation LIKE '.$search.' OR a.components LIKE '.$search.' OR g.system_name LIKE '.$search.')');
+				$query->where('(a.entranslation LIKE '.$search.')');
 			}
 		}
 
diff --git a/admin/tables/language_translation.php b/admin/tables/language_translation.php
index 8ef007204..ae42ef281 100644
--- a/admin/tables/language_translation.php
+++ b/admin/tables/language_translation.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 29 of this MVC
+	@version		@update number 30 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translation/submitbutton.js b/admin/views/language_translation/submitbutton.js
index 68b1f2be3..ac01845d1 100644
--- a/admin/views/language_translation/submitbutton.js
+++ b/admin/views/language_translation/submitbutton.js
@@ -9,7 +9,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 29 of this MVC
+	@version		@update number 30 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translation/tmpl/edit.php b/admin/views/language_translation/tmpl/edit.php
index d8d9eb7c8..58459ce31 100644
--- a/admin/views/language_translation/tmpl/edit.php
+++ b/admin/views/language_translation/tmpl/edit.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 29 of this MVC
+	@version		@update number 30 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translation/view.html.php b/admin/views/language_translation/view.html.php
index 282502619..13fdac074 100644
--- a/admin/views/language_translation/view.html.php
+++ b/admin/views/language_translation/view.html.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 29 of this MVC
+	@version		@update number 30 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translations/tmpl/default.php b/admin/views/language_translations/tmpl/default.php
index 4325b6c30..548979e70 100644
--- a/admin/views/language_translations/tmpl/default.php
+++ b/admin/views/language_translations/tmpl/default.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 29 of this MVC
+	@version		@update number 30 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translations/tmpl/default_batch_body.php b/admin/views/language_translations/tmpl/default_batch_body.php
index 926292db9..a5d39ed21 100644
--- a/admin/views/language_translations/tmpl/default_batch_body.php
+++ b/admin/views/language_translations/tmpl/default_batch_body.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 29 of this MVC
+	@version		@update number 30 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translations/tmpl/default_batch_footer.php b/admin/views/language_translations/tmpl/default_batch_footer.php
index a97479b38..441e7e166 100644
--- a/admin/views/language_translations/tmpl/default_batch_footer.php
+++ b/admin/views/language_translations/tmpl/default_batch_footer.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 29 of this MVC
+	@version		@update number 30 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translations/tmpl/default_body.php b/admin/views/language_translations/tmpl/default_body.php
index 2146fdc77..a0f88c32c 100644
--- a/admin/views/language_translations/tmpl/default_body.php
+++ b/admin/views/language_translations/tmpl/default_body.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 29 of this MVC
+	@version		@update number 30 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translations/tmpl/default_foot.php b/admin/views/language_translations/tmpl/default_foot.php
index 9bd6b6b33..300753482 100644
--- a/admin/views/language_translations/tmpl/default_foot.php
+++ b/admin/views/language_translations/tmpl/default_foot.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 29 of this MVC
+	@version		@update number 30 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translations/tmpl/default_head.php b/admin/views/language_translations/tmpl/default_head.php
index 6e1c0e804..069946a85 100644
--- a/admin/views/language_translations/tmpl/default_head.php
+++ b/admin/views/language_translations/tmpl/default_head.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 29 of this MVC
+	@version		@update number 30 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
@@ -47,7 +47,7 @@ defined('_JEXEC') or die('Restricted access');
 			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ENTRANSLATION_LABEL', 'entranslation', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_COMPONENTS_LABEL', 'components_system_name', $this->listDirn, $this->listOrder); ?>
+			<?php echo JText::_('COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_COMPONENTS_LABEL'); ?>
 	</th>
 	<?php if ($this->canState): ?>
 		<th width="10" class="nowrap center" >
diff --git a/admin/views/language_translations/tmpl/default_toolbar.php b/admin/views/language_translations/tmpl/default_toolbar.php
index 869ddbc7d..939fe3865 100644
--- a/admin/views/language_translations/tmpl/default_toolbar.php
+++ b/admin/views/language_translations/tmpl/default_toolbar.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 29 of this MVC
+	@version		@update number 30 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translations/view.html.php b/admin/views/language_translations/view.html.php
index 85fc2b001..3d411ec21 100644
--- a/admin/views/language_translations/view.html.php
+++ b/admin/views/language_translations/view.html.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 29 of this MVC
+	@version		@update number 30 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder