diff --git a/admin_language/en-GB/en-GB.com_tjfields.ini b/admin_language/en-GB/en-GB.com_tjfields.ini
index e5c071ce..8820d0e6 100755
--- a/admin_language/en-GB/en-GB.com_tjfields.ini
+++ b/admin_language/en-GB/en-GB.com_tjfields.ini
@@ -135,7 +135,7 @@ COM_TJFIELDS_FORM_DESC_EDITOR_WIDTH="Set width"
 COM_TJFIELDS_FORM_LBL_EDITOR_HEIGHT="Height"
 COM_TJFIELDS_FORM_DESC_EDITOR_HEIGHT="Set height"
 COM_TJFIELDS_FORM_LBL_FIELD_SIZE="Size"
-COM_TJFIELDS_FORM_DESC_FIELD_SIZE="Set maximum allowed file size (In MB) e.g 10, 20"
+COM_TJFIELDS_FORM_DESC_FIELD_SIZE="Set size"
 COM_TJFIELDS_FORM_LBL_FIELD_MAXLENGTH="Max Length"
 COM_TJFIELDS_FORM_LBL_FIELD_MIN="Min Value"
 COM_TJFIELDS_FORM_DESC_FIELD_MIN="Min Value"
diff --git a/administrator/models/fields.php b/administrator/models/fields.php
index f257a822..519d9007 100755
--- a/administrator/models/fields.php
+++ b/administrator/models/fields.php
@@ -184,7 +184,7 @@ protected function getListQuery()
 			else
 			{
 				$search = $db->Quote('%' . $db->escape($search, true) . '%');
-				$query->where('( a.type LIKE ' . $search . ' )');
+				$query->where('( a.label LIKE ' . $search . ' )');
 			}
 		}
 
diff --git a/administrator/models/forms/types/forms/text.xml b/administrator/models/forms/types/forms/text.xml
index c799805e..bc29b504 100755
--- a/administrator/models/forms/types/forms/text.xml
+++ b/administrator/models/forms/types/forms/text.xml
@@ -4,7 +4,7 @@
 		<fieldset name="params">
 			<field name="default" type="text" label="COM_TJFIELDS_FORM_LBL_FIELD_DEFAULT" description="COM_TJFIELDS_FORM_DESC_FIELD_DEFAULT"/>
 			<field name="size" type="number" label="COM_TJFIELDS_FORM_LBL_FIELD_SIZE" description="COM_TJFIELDS_FORM_DESC_FIELD_SIZE"/>
-			<field name="maxlength" type="number" label="COM_TJFIELDS_FORM_LBL_FIELD_MAXLENGTH" description="COM_TJFIELDS_FORM_DESC_FIELD_SIZE"/>
+			<field name="maxlength" type="number" label="COM_TJFIELDS_FORM_LBL_FIELD_MAXLENGTH" description="COM_TJFIELDS_FORM_DESC_FIELD_MAXLENGTH"/>
 			<field name="hint" type="text" label="COM_TJFIELDS_FORM_LBL_TEXT_FIELD_PLACEHOLDER" description="COM_TJFIELDS_FORM_DESC_TEXT_FIELD_PLACEHOLDER"/>
 		</fieldset>
 	</fields>
diff --git a/site/layouts/fields/sql.php b/site/layouts/fields/sql.php
index e967fcac..3a5075a3 100644
--- a/site/layouts/fields/sql.php
+++ b/site/layouts/fields/sql.php
@@ -24,6 +24,12 @@
 }
 
 $options = $field->getOptions();
+
+if (empty($options))
+{
+	return;
+}
+
 $fieldOptions = array();
 
 foreach ($options as $option)
@@ -51,4 +57,4 @@
 			echo "<br>";
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/site/layouts/fields/subform.php b/site/layouts/fields/subform.php
index a8d57a03..4e4e435d 100644
--- a/site/layouts/fields/subform.php
+++ b/site/layouts/fields/subform.php
@@ -44,33 +44,36 @@
 				</div>
 				<div class='col-xs-6'>
 					<?php
-					if ($field->type == 'List' || $field->type == 'Radio')
+					if (isset($subformData[$field->getAttribute('name')]))
 					{
-						$fieldXml = $form->getFieldXml($field->getAttribute('name'));
-						$field->value = $subformData[$field->getAttribute('name')];
+						if ($field->type == 'List' || $field->type == 'Radio')
+						{
+							$fieldXml = $form->getFieldXml($field->getAttribute('name'));
+							$field->value = $subformData[$field->getAttribute('name')];
 
-						$layout = new JLayoutFile('list', JPATH_ROOT . '/components/com_tjfields/layouts/fields');
-						echo $layout->render(array('fieldXml' => $fieldXml, 'field' => $field));
-					}
-					elseif ($field->type == 'Checkbox')
-					{
-						if ($subformData[$field->getAttribute('name')])
+							$layout = new JLayoutFile('list', JPATH_ROOT . '/components/com_tjfields/layouts/fields');
+							echo $layout->render(array('fieldXml' => $fieldXml, 'field' => $field));
+						}
+						elseif ($field->type == 'Checkbox')
 						{
-							?>
-							<input type="checkbox" checked="checked">
-							<?php
+							if ($subformData[$field->getAttribute('name')])
+							{
+								?>
+								<input type="checkbox" checked="checked">
+								<?php
+							}
+							else
+							{
+								?>
+								<input type="checkbox">
+								<?php
+							}
 						}
 						else
 						{
-							?>
-							<input type="checkbox">
-							<?php
+							echo $subformData[$field->getAttribute('name')];
 						}
 					}
-					else
-					{
-						echo $subformData[$field->getAttribute('name')];
-					}
 					?>
 				</div>
 				<?php
@@ -81,4 +84,4 @@
 		<hr>
 		<?php
 	}
-}
\ No newline at end of file
+}