diff --git a/src/administrator/components/com_weblinks/config.xml b/src/administrator/components/com_weblinks/config.xml
index cdeed62..90d7d0b 100644
--- a/src/administrator/components/com_weblinks/config.xml
+++ b/src/administrator/components/com_weblinks/config.xml
@@ -317,19 +317,20 @@
 		>
 		<field
 			name="filter_field"
-			type="list"
+			type="radio"
+			layout="joomla.form.field.radio.switcher"
 			label="JGLOBAL_FILTER_FIELD_LABEL"
-			default="1"
+			default="0"
 			>
+			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
-			<option value="hide">JHIDE</option>
 		</field>
 
 		<field
 			name="show_pagination_limit"
 			type="radio"
 			layout="joomla.form.field.radio.switcher"
-			default="1"
+			default="0"
 			label="JGLOBAL_DISPLAY_SELECT_LABEL"
 			>
 			<option value="1">JSHOW</option>
diff --git a/src/administrator/language/en-GB/com_weblinks.ini b/src/administrator/language/en-GB/com_weblinks.ini
index 2c450ff..0898fda 100644
--- a/src/administrator/language/en-GB/com_weblinks.ini
+++ b/src/administrator/language/en-GB/com_weblinks.ini
@@ -38,8 +38,8 @@ COM_WEBLINKS_FIELD_IMAGE_CAPTION_LABEL="Caption"
 COM_WEBLINKS_FIELD_MODIFIED_DESC="The date and time the link was last modified."
 COM_WEBLINKS_FIELD_SECOND_LABEL="Second Image"
 COM_WEBLINKS_FIELD_SELECT_CATEGORY_LABEL="Select a Category"
-COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_LABEL="Show Tags"
-COM_WEBLINKS_FIELD_SHOW_TAGS_LABEL="Show Tags"
+COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_LABEL="Category Tags"
+COM_WEBLINKS_FIELD_SHOW_TAGS_LABEL="Tags"
 COM_WEBLINKS_FIELD_TARGET_LABEL="Target"
 COM_WEBLINKS_FIELD_URL_LABEL="URL"
 COM_WEBLINKS_FIELD_VALUE_REPORTED="Reported"