diff --git a/src/modules/mod_weblinks/mod_weblinks.xml b/src/modules/mod_weblinks/mod_weblinks.xml
index 2fe89d7..904dbef 100644
--- a/src/modules/mod_weblinks/mod_weblinks.xml
+++ b/src/modules/mod_weblinks/mod_weblinks.xml
@@ -25,19 +25,21 @@
 					extension="com_weblinks"
 					required="true"
 					label="JCATEGORY"
-					description="MOD_WEBLINKS_FIELD_CATEGORY_DESC" />
+					description="MOD_WEBLINKS_FIELD_CATEGORY_DESC"
+				/>
+
 				<field
 					name="groupby"
 					type="radio"
 					class="btn-group btn-group-yesno"
 					default="0"
 					label="MOD_WEBLINKS_FIELD_GROUPBY_LABEL"
-					description="MOD_WEBLINKS_FIELD_GROUPBY_DESC">
-					<option
-						value="1">JYES</option>
-					<option
-						value="0">JNO</option>
+					description="MOD_WEBLINKS_FIELD_GROUPBY_DESC"
+				>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
 				</field>
+
 				<field
 					name="groupby_showtitle"
 					type="radio"
@@ -46,12 +48,11 @@
 					label="MOD_WEBLINKS_FIELD_GROUPBYSHOWTITLE_LABEL"
 					description="MOD_WEBLINKS_FIELD_GROUPBYSHOWTITLE_DESC"
 					showon="groupby:1"
-					>
-					<option
-					    value="1">JYES</option>
-					<option
-					    value="0">JNO</option>
+				>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
 				</field>
+
 				<field
 					name="groupby_ordering"
 					type="list"
@@ -59,12 +60,11 @@
 					label="MOD_WEBLINKS_FIELD_GROUPBYORDERING_LABEL"
 					description="MOD_WEBLINKS_FIELD_GROUPBYORDERING_DESC"
 					showon="groupby:1"
-					>
-					<option
-					    value="c.title">JGLOBAL_TITLE</option>
-					<option
-					    value="c.lft">MOD_WEBLINKS_FIELD_VALUE_ORDER</option>
+				>
+					<option value="c.title">JGLOBAL_TITLE</option>
+					<option value="c.lft">MOD_WEBLINKS_FIELD_VALUE_ORDER</option>
 				</field>
+
 				<field
 					name="groupby_direction"
 					type="list"
@@ -72,106 +72,101 @@
 					label="MOD_WEBLINKS_FIELD_GROUPBYDIRECTION_LABEL"
 					description="MOD_WEBLINKS_FIELD_GROUPBYDIRECTION_DESC"
 					showon="groupby:1"
-					>
-					<option
-					    value="asc">MOD_WEBLINKS_FIELD_VALUE_ASCENDING</option>
-					<option
-					    value="desc">MOD_WEBLINKS_FIELD_VALUE_DESCENDING</option>
+				>
+					<option value="asc">MOD_WEBLINKS_FIELD_VALUE_ASCENDING</option>
+					<option value="desc">MOD_WEBLINKS_FIELD_VALUE_DESCENDING</option>
 				</field>
+
 				<field
 					name="groupby_columns"
 					type="list"
 					default="3"
 					label="MOD_WEBLINKS_FIELD_COLUMNS_LABEL"
-					description="MOD_WEBLINKS_FIELD_COLUMNS_DESC">
-					<option
-					    value="1">1</option>
-                    <option
-					    value="2">2</option>
-					<option
-					    value="3">3</option>
-					<option
-					    value="4">4</option>
-					<option
-					    value="6">6</option>
+					description="MOD_WEBLINKS_FIELD_COLUMNS_DESC"
+				>
+					<option value="1">J1</option>
+                    <option value="2">J2</option>
+					<option value="3">J3</option>
+					<option value="4">J4</option>
+					<option value="6">J6</option>
 				</field>
+
 				<field
 					name="count"
 					type="text"
 					default="5"
 					label="MOD_WEBLINKS_FIELD_COUNT_LABEL"
-					description="MOD_WEBLINKS_FIELD_COUNT_DESC" />
+					description="MOD_WEBLINKS_FIELD_COUNT_DESC"
+				/>
+
 				<field
 					name="ordering"
 					type="list"
 					default="title"
 					label="MOD_WEBLINKS_FIELD_ORDERING_LABEL"
-					description="MOD_WEBLINKS_FIELD_ORDERING_DESC">
-					<option
-						value="title">JGLOBAL_TITLE</option>
-					<option
-						value="order">MOD_WEBLINKS_FIELD_VALUE_ORDER</option>
-					<option
-						value="hits">MOD_WEBLINKS_FIELD_VALUE_HITS</option>
+					description="MOD_WEBLINKS_FIELD_ORDERING_DESC"
+				>
+					<option value="title">JGLOBAL_TITLE</option>
+					<option value="order">MOD_WEBLINKS_FIELD_VALUE_ORDER</option>
+					<option value="hits">MOD_WEBLINKS_FIELD_VALUE_HITS</option>
 				</field>
+
 				<field
 					name="direction"
 					type="list"
 					default="asc"
 					label="MOD_WEBLINKS_FIELD_ORDERDIRECTION_LABEL"
-					description="MOD_WEBLINKS_FIELD_ORDERDIRECTION_DESC">
-					<option
-						value="asc">MOD_WEBLINKS_FIELD_VALUE_ASCENDING</option>
-					<option
-						value="desc">MOD_WEBLINKS_FIELD_VALUE_DESCENDING</option>
+					description="MOD_WEBLINKS_FIELD_ORDERDIRECTION_DESC"
+				>
+					<option value="asc">MOD_WEBLINKS_FIELD_VALUE_ASCENDING</option>
+					<option value="desc">MOD_WEBLINKS_FIELD_VALUE_DESCENDING</option>
 				</field>
+
 				<field
 					name="target"
 					type="list"
 					default="3"
 					label="MOD_WEBLINKS_FIELD_TARGET_LABEL"
-					description="MOD_WEBLINKS_FIELD_TARGET_DESC">
-					<option
-						value="1">JBROWSERTARGET_NEW</option>
-					<option
-						value="2">JBROWSERTARGET_POPUP</option>
-					<option
-						value="3">JBROWSERTARGET_PARENT</option>
+					description="MOD_WEBLINKS_FIELD_TARGET_DESC"
+				>
+					<option value="1">JBROWSERTARGET_NEW</option>
+					<option value="2">JBROWSERTARGET_POPUP</option>
+					<option value="3">JBROWSERTARGET_PARENT</option>
 				</field>
+
 				<field
 					name="follow"
 					type="list"
 					default="0"
 					label="MOD_WEBLINKS_FIELD_FOLLOW_LABEL"
-					description="MOD_WEBLINKS_FIELD_FOLLOW_DESC">
-					<option
-						value="follow">MOD_WEBLINKS_FIELD_VALUE_FOLLOW</option>
-					<option
-						value="nofollow">MOD_WEBLINKS_FIELD_VALUE_NOFOLLOW</option>
+					description="MOD_WEBLINKS_FIELD_FOLLOW_DESC"
+				>
+					<option value="follow">MOD_WEBLINKS_FIELD_VALUE_FOLLOW</option>
+					<option value="nofollow">MOD_WEBLINKS_FIELD_VALUE_NOFOLLOW</option>
 				</field>
+
 				<field
 					name="description"
 					type="radio"
 					class="btn-group btn-group-yesno"
 					default="0"
 					label="MOD_WEBLINKS_FIELD_DESCRIPTION_LABEL"
-					description="MOD_WEBLINKS_FIELD_DESCRIPTION_DESC">
-					<option
-						value="1">JSHOW</option>
-					<option
-						value="0">JHIDE</option>
+					description="MOD_WEBLINKS_FIELD_DESCRIPTION_DESC"
+				>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
 				</field>
+
 				<field
 					name="hits"
 					type="radio"
 					class="btn-group btn-group-yesno"
 					default="0"
 					label="MOD_WEBLINKS_FIELD_HITS_LABEL"
-					description="MOD_WEBLINKS_FIELD_HITS_DESC">
-					<option
-						value="1">JSHOW</option>
-					<option
-						value="0">JHIDE</option>
+					description="MOD_WEBLINKS_FIELD_HITS_DESC"
+				>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
 				</field>
 
 				<field
@@ -180,51 +175,53 @@
 					class="chzn-color"
 					default="0"
 					label="MOD_WEBLINKS_FIELD_COUNTCLICKS_LABEL"
-					description="MOD_WEBLINKS_FIELD_COUNTCLICKS_DESC">
-						<option
-						value="">JGLOBAL_USE_GLOBAL</option>
-					<option
-						value="0">JNO</option>
-					<option
-						value="1">JYES</option>
+					description="MOD_WEBLINKS_FIELD_COUNTCLICKS_DESC"
+				>
+					<option value="">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
 				</field>
 			</fieldset>
-			<fieldset
-				name="advanced">
+			<fieldset name="advanced">
 				<field
 					name="layout"
 					type="modulelayout"
 					label="JFIELD_ALT_LAYOUT_LABEL"
-					description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
 				<field
 					name="moduleclass_sfx"
-					type="textarea" rows="3"
+					type="textarea"
+					rows="3"
 					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+				/>
+
 				<field
 					name="cache"
 					type="list"
 					default="1"
 					label="COM_MODULES_FIELD_CACHING_LABEL"
-					description="COM_MODULES_FIELD_CACHING_DESC">
-					<option
-						value="1">JGLOBAL_USE_GLOBAL</option>
-					<option
-						value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+					description="COM_MODULES_FIELD_CACHING_DESC"
+				>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
 				</field>
+
 				<field
 					name="cache_time"
 					type="text"
 					default="900"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
-					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+				/>
+
 				<field
 					name="cachemode"
 					type="hidden"
-					default="static">
-					<option
-						value="static"></option>
-				</field>
+					default="static"
+				/>
 			</fieldset>
 		</fields>
 	</config>
diff --git a/src/plugins/search/weblinks/weblinks.xml b/src/plugins/search/weblinks/weblinks.xml
index d5a8e33..b8eade5 100644
--- a/src/plugins/search/weblinks/weblinks.xml
+++ b/src/plugins/search/weblinks/weblinks.xml
@@ -17,16 +17,19 @@
 	</languages>
 	<config>
 		<fields name="params">
-
 			<fieldset name="basic">
-				<field name="search_limit" type="text"
+				<field
+					name="search_limit"
+					type="text"
 					default="50"
 					description="JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC"
 					label="JFIELD_PLG_SEARCH_SEARCHLIMIT_LABEL"
 					size="5"
 				/>
 
-				<field name="search_content" type="radio"
+				<field
+					name="search_content"
+					type="radio"
 					class="btn-group btn-group-yesno"
 					default="0"
 					description="JFIELD_PLG_SEARCH_ALL_DESC"
@@ -36,7 +39,9 @@
 					<option value="0">JOFF</option>
 				</field>
 
-				<field name="search_archived" type="radio"
+				<field
+					name="search_archived"
+					type="radio"
 					class="btn-group btn-group-yesno"
 					default="0"
 					description="JFIELD_PLG_SEARCH_ARCHIVED_DESC"