diff --git a/CHANGES.md b/CHANGES.md
index d211d2d2..ea6731fe 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -66,6 +66,7 @@
 * Remove restriction to not display snatched eps link in footer on Episode Overview page
 * Change the shows episodes count text colour to visually separete from year numbers at the end of show names
 * Change to add clarity to the subtitle and other columns on the Mass Update page
+* Change to improve clarity with "Limited backlog search" on the Config/Search Settings page
 * Add tooltips to explain why any the 6 action columns are disabled when required on the Mass Update page
 * Change to reclaimed screen estate by hiding unused columns on the Mass Update page
 * Change order of option on Mass Edit page to be inline with show edit page
diff --git a/gui/slick/interfaces/default/config_search.tmpl b/gui/slick/interfaces/default/config_search.tmpl
index 07e61606..7b1b7ace 100755
--- a/gui/slick/interfaces/default/config_search.tmpl
+++ b/gui/slick/interfaces/default/config_search.tmpl
@@ -21,7 +21,7 @@
 #end if
 
 #set $html_selected = ' selected="selected"'
-#set $html_checked = 'checked="checked" '
+#set $html_checked = ' checked="checked"'
 
 <div id="config">
 	<div id="config-content">
@@ -48,7 +48,7 @@
 							<label for="download_propers">
 								<span class="component-title">Download propers</span>
 								<span class="component-desc">
-									<input type="checkbox" name="download_propers" id="download_propers" class="enabler" <%= html_checked if sickbeard.DOWNLOAD_PROPERS == True else '' %>/>
+									<input type="checkbox" name="download_propers" id="download_propers" class="enabler"<%= html_checked if sickbeard.DOWNLOAD_PROPERS == True else '' %>>
 									<p>replace original download with "Proper" or "Repack" if nuked</p>
 								</span>
 							</label>
@@ -56,7 +56,7 @@
 						<div id="content_download_propers">
 							<div class="field-pair">
 								<label for="check_propers_interval">
-									<span class="component-title">Check propers every:</span>
+									<span class="component-title input">Check propers every:</span>
 									<span class="component-desc">
 										<select id="check_propers_interval" name="check_propers_interval" class="form-control input-sm">
 #set $check_propers_interval_text = {'daily': "24 hours", '4h': "4 hours", '90m': "90 mins", '45m': "45 mins", '15m': "15 mins"}
@@ -72,19 +72,29 @@
 
 						<div class="field-pair">
 							<label>
-								<span class="component-title">Backlog search day(s)</span>
+								<span class="component-title input">Recent search frequency</span>
 								<span class="component-desc">
-									<input type="text" name="backlog_days" value="$sickbeard.BACKLOG_DAYS" class="form-control input-sm input75" />
-									<p>number of day(s) that the search will cover (e.g. 7)</p>
+									<input type="text" name="recentsearch_frequency" value="$sickbeard.RECENTSEARCH_FREQUENCY" class="form-control input-sm input75">
+									<p>time in minutes between searches (min. $sickbeard.MIN_RECENTSEARCH_FREQUENCY)</p>
 								</span>
 							</label>
 						</div>
 
 						<div class="field-pair">
 							<label>
-								<span class="component-title">Backlog search frequency</span>
+								<span class="component-title input">Limited backlog search</span>
 								<span class="component-desc">
-									<input type="text" name="backlog_frequency" value="$sickbeard.BACKLOG_FREQUENCY" class="form-control input-sm input75" />
+									<input type="text" name="backlog_days" value="$sickbeard.BACKLOG_DAYS" class="form-control input-sm input75">
+									<p>day(s) that the limited search will cover (e.g. 7)</p>
+								</span>
+							</label>
+						</div>
+
+						<div class="field-pair">
+							<label>
+								<span class="component-title input">Backlog search frequency</span>
+								<span class="component-desc">
+									<input type="text" name="backlog_frequency" value="$sickbeard.BACKLOG_FREQUENCY" class="form-control input-sm input75">
 									<p>time in minutes between searches (min. $sickbeard.MIN_BACKLOG_FREQUENCY)</p>
 								</span>
 							</label>
@@ -92,19 +102,9 @@
 
 						<div class="field-pair">
 							<label>
-								<span class="component-title">Recent search frequency</span>
+								<span class="component-title input">Usenet retention</span>
 								<span class="component-desc">
-									<input type="text" name="recentsearch_frequency" value="$sickbeard.RECENTSEARCH_FREQUENCY" class="form-control input-sm input75" />
-									<p>time in minutes between searches (min. $sickbeard.MIN_RECENTSEARCH_FREQUENCY)</p>
-									</span>
-							</label>
-						</div>
-
-						<div class="field-pair">
-							<label>
-								<span class="component-title">Usenet retention</span>
-								<span class="component-desc">
-									<input type="text" name="usenet_retention" value="$sickbeard.USENET_RETENTION" class="form-control input-sm input75" />
+									<input type="text" name="usenet_retention" value="$sickbeard.USENET_RETENTION" class="form-control input-sm input75">
 									<p>age limit in days for usenet articles to be used (e.g. 500)</p>
 								</span>
 							</label>
@@ -112,9 +112,9 @@
 
 						<div class="field-pair">
 							<label>
-								<span class="component-title">Ignore result with any word</span>
+								<span class="component-title input">Ignore result with any word</span>
 								<span class="component-desc">
-									<input type="text" name="ignore_words" value="$sickbeard.IGNORE_WORDS" class="form-control input-sm input350" />
+									<input type="text" name="ignore_words" value="$sickbeard.IGNORE_WORDS" class="form-control input-sm input350">
 									<div class="clear-left">ignore search result <em class="grey-text">if its title contains any</em> of these comma seperated words</div>
 								</span>
 							</label>
@@ -122,9 +122,9 @@
 
 						<div class="field-pair">
 							<label>
-								<span class="component-title">Require at least one word</span>
+								<span class="component-title input">Require at least one word</span>
 								<span class="component-desc">
-									<input type="text" name="require_words" value="$sickbeard.REQUIRE_WORDS" class="form-control input-sm input350" />
+									<input type="text" name="require_words" value="$sickbeard.REQUIRE_WORDS" class="form-control input-sm input350">
 									<div class="clear-left">ignore search result <em class="grey-text">unless its title contains one</em> of these comma seperated words</div>
 								</span>
 							</label>
@@ -134,13 +134,13 @@
 							<label for="allow_high_priority">
 								<span class="component-title">Allow high priority</span>
 								<span class="component-desc">
-									<input type="checkbox" name="allow_high_priority" id="allow_high_priority" <%= html_checked if sickbeard.ALLOW_HIGH_PRIORITY == True else '' %>/>
+									<input type="checkbox" name="allow_high_priority" id="allow_high_priority"<%= html_checked if sickbeard.ALLOW_HIGH_PRIORITY == True else '' %>>
 									<p>set downloads of recently aired episodes to high priority</p>
 								</span>
 							</label>
 						</div>
 
-						<input type="submit" class="btn config_submitter" value="Save Changes" />
+						<input type="submit" class="btn config_submitter" value="Save Changes">
 
 					</fieldset>
 				</div><!-- /component-group1 //-->
@@ -158,7 +158,7 @@
 							<label for="use_nzbs">
 								<span class="component-title">Search NZBs</span>
 								<span class="component-desc">
-									<input type="checkbox" name="use_nzbs" class="enabler" id="use_nzbs" <%= html_checked if sickbeard.USE_NZBS else '' %>/>
+									<input type="checkbox" name="use_nzbs" class="enabler" id="use_nzbs"<%= html_checked if sickbeard.USE_NZBS else '' %>>
 									<p>enable NZB search providers</p></span>
 							</label>
 						</div>
@@ -184,7 +184,7 @@
 								<label>
 									<span class="component-title">Black hole folder location</span>
 									<span class="component-desc">
-										<input type="text" name="nzb_dir" id="nzb_dir" value="$sickbeard.NZB_DIR" class="form-control input-sm input350" />
+										<input type="text" name="nzb_dir" id="nzb_dir" value="$sickbeard.NZB_DIR" class="form-control input-sm input350">
 										<div class="clear-left"><p><b>.nzb</b> files are stored at this location for external software to find and use</p></div>
 									</span>
 								</label>
@@ -196,7 +196,7 @@
 								<label>
 									<span class="component-title">SABnzbd server URL</span>
 									<span class="component-desc">
-										<input type="text" id="sab_host" name="sab_host" value="$sickbeard.SAB_HOST" class="form-control input-sm input350" />
+										<input type="text" id="sab_host" name="sab_host" value="$sickbeard.SAB_HOST" class="form-control input-sm input350">
 										<div class="clear-left"><p>URL to your SABnzbd server (e.g. http://localhost:8080/)</p></div>
 									</span>
 								</label>
@@ -206,7 +206,7 @@
 								<label>
 									<span class="component-title">SABnzbd username</span>
 									<span class="component-desc">
-										<input type="text" name="sab_username" id="sab_username" value="$sickbeard.SAB_USERNAME" class="form-control input-sm input200" />
+										<input type="text" name="sab_username" id="sab_username" value="$sickbeard.SAB_USERNAME" class="form-control input-sm input200">
 										<p>(blank for none)</p>
 									</span>
 								</label>
@@ -216,7 +216,7 @@
 								<label>
 									<span class="component-title">SABnzbd password</span>
 									<span class="component-desc">
-										<input type="password" name="sab_password" id="sab_password" value="#echo '*' * len($sickbeard.SAB_PASSWORD)#" class="form-control input-sm input200" />
+										<input type="password" name="sab_password" id="sab_password" value="#echo '*' * len($sickbeard.SAB_PASSWORD)#" class="form-control input-sm input200">
 										<p>(blank for none)</p>
 									</span>
 								</label>
@@ -226,7 +226,7 @@
 								<label>
 									<span class="component-title">SABnzbd API key</span>
 									<span class="component-desc">
-										<input type="text" name="sab_apikey" id="sab_apikey" value="<%= starify(sickbeard.SAB_APIKEY) %>" class="form-control input-sm input350" />
+										<input type="text" name="sab_apikey" id="sab_apikey" value="<%= starify(sickbeard.SAB_APIKEY) %>" class="form-control input-sm input350">
 										<div class="clear-left"><p>locate at... SABnzbd Config -> General -> API Key</p></div>
 									</span>
 								</label>
@@ -236,7 +236,7 @@
 								<label>
 									<span class="component-title">Use SABnzbd category</span>
 									<span class="component-desc">
-										<input type="text" name="sab_category" id="sab_category" value="$sickbeard.SAB_CATEGORY" class="form-control input-sm input200" />
+										<input type="text" name="sab_category" id="sab_category" value="$sickbeard.SAB_CATEGORY" class="form-control input-sm input200">
 										<p>add downloads to this category (e.g. TV)</p>
 									</span>
 								</label>
@@ -248,7 +248,7 @@
 								<label for="nzbget_use_https">
 									<span class="component-title">Connect using HTTPS</span>
 									<span class="component-desc">
-										<input id="nzbget_use_https" type="checkbox" class="enabler" name="nzbget_use_https" <%= html_checked if sickbeard.NZBGET_USE_HTTPS == True else '' %>/>
+										<input id="nzbget_use_https" type="checkbox" class="enabler" name="nzbget_use_https"<%= html_checked if sickbeard.NZBGET_USE_HTTPS == True else '' %>>
 										<p><b>note:</b> enable Secure control in NZBGet and set the correct Secure Port here</p>
 									</span>
 								</label>
@@ -259,7 +259,7 @@
 								<label>
 									<span class="component-title">NZBget host:port</span>
 									<span class="component-desc">
-										<input type="text" name="nzbget_host" id="nzbget_host" value="$sickbeard.NZBGET_HOST" class="form-control input-sm input350" />
+										<input type="text" name="nzbget_host" id="nzbget_host" value="$sickbeard.NZBGET_HOST" class="form-control input-sm input350">
 										<p>(e.g. localhost:6789)</p>
 										<div class="clear-left"><p>NZBget RPC host name and port number (not NZBgetweb!)</p></div>
 									</span>
@@ -270,7 +270,7 @@
 								<label>
 									<span class="component-title">NZBget username</span>
 									<span class="component-desc">
-										<input type="text" name="nzbget_username" value="$sickbeard.NZBGET_USERNAME" class="form-control input-sm input200" />
+										<input type="text" name="nzbget_username" value="$sickbeard.NZBGET_USERNAME" class="form-control input-sm input200">
 										<p>locate in nzbget.conf (default:nzbget)</p>
 									</span>
 								</label>
@@ -280,7 +280,7 @@
 								<label>
 									<span class="component-title">NZBget password</span>
 									<span class="component-desc">
-										<input type="password" name="nzbget_password" id="nzbget_password" value="#echo '*' * len($sickbeard.NZBGET_PASSWORD)#" class="form-control input-sm input200" />
+										<input type="password" name="nzbget_password" id="nzbget_password" value="#echo '*' * len($sickbeard.NZBGET_PASSWORD)#" class="form-control input-sm input200">
 										<p>locate in nzbget.conf (default:tegbzn6789)</p>
 									</span>
 								</label>
@@ -290,7 +290,7 @@
 								<label>
 									<span class="component-title">Use NZBget category</span>
 									<span class="component-desc">
-										<input type="text" name="nzbget_category" id="nzbget_category" value="$sickbeard.NZBGET_CATEGORY" class="form-control input-sm input200" />
+										<input type="text" name="nzbget_category" id="nzbget_category" value="$sickbeard.NZBGET_CATEGORY" class="form-control input-sm input200">
 										<p>send downloads marked this category (e.g. TV)</p>
 									</span>
 								</label>
@@ -336,8 +336,8 @@
 						</div>
 
 						<div class="testNotification" id="testSABnzbd_result">Click below to test</div>
-						<input class="btn" type="button" value="Test SABnzbd" id="testSABnzbd" class="btn test-button"/>
-						<input type="submit" class="btn config_submitter" value="Save Changes" /><br/>
+						<input class="btn" type="button" value="Test SABnzbd" id="testSABnzbd" class="btn test-button">
+						<input type="submit" class="btn config_submitter" value="Save Changes"><br />
 
 						</div><!-- /content_use_nzbs //-->
 
@@ -358,7 +358,7 @@
 							<label for="use_torrents">
 								<span class="component-title">Search torrents</span>
 								<span class="component-desc">
-									<input type="checkbox" name="use_torrents" class="enabler" id="use_torrents" <%= html_checked if sickbeard.USE_TORRENTS == True else '' %>/>
+									<input type="checkbox" name="use_torrents" class="enabler" id="use_torrents"<%= html_checked if sickbeard.USE_TORRENTS == True else '' %>>
 									<p>enable torrent search providers</p>
 								</span>
 							</label>
@@ -383,14 +383,14 @@
 								<label>
 									<span class="component-title">Black hole folder location</span>
 									<span class="component-desc">
-										<input type="text" name="torrent_dir" id="torrent_dir" value="$sickbeard.TORRENT_DIR" class="form-control input-sm input350" />
+										<input type="text" name="torrent_dir" id="torrent_dir" value="$sickbeard.TORRENT_DIR" class="form-control input-sm input350">
 										<div class="clear-left"><p><b>.torrent</b> files are stored at this location for external software to find and use</p></div>
 									</span>
 								</label>
 							</div>
 
 							<div></div>
-							<input type="submit" class="btn config_submitter" value="Save Changes" /><br/>
+							<input type="submit" class="btn config_submitter" value="Save Changes"><br />
 							</div>
 						</div>
 
@@ -399,7 +399,7 @@
 								<label>
 									<span class="component-title" id="host_title">Torrent host:port</span>
 									<span class="component-desc">
-										<input type="text" name="torrent_host" id="torrent_host" value="$sickbeard.TORRENT_HOST" class="form-control input-sm input350" />
+										<input type="text" name="torrent_host" id="torrent_host" value="$sickbeard.TORRENT_HOST" class="form-control input-sm input350">
 										<div class="clear-left">
 											<p id="host_desc_torrent">URL to your torrent client (e.g. http://localhost:8000/)</p>
 											<p id="host_desc_rtorrent" style="display:none"><b>Note:</b> <i>rTorrent</i> client URLs use e.g. scgi://localhost:5000/</p>
@@ -413,7 +413,7 @@
 								<label for="torrent_verify_cert">
 									<span class="component-title">Verify certificate</span>
 									<span class="component-desc">
-										<input type="checkbox" name="torrent_verify_cert" class="enabler" id="torrent_verify_cert" <%= html_checked if sickbeard.TORRENT_VERIFY_CERT == True else '' %>/>
+										<input type="checkbox" name="torrent_verify_cert" class="enabler" id="torrent_verify_cert"<%= html_checked if sickbeard.TORRENT_VERIFY_CERT == True else '' %>>
 										<p>disable if you get "Deluge: Authentication Error" in your log</p>
 									</span>
 								</label>
@@ -423,7 +423,7 @@
 								<label>
 									<span class="component-title" id="username_title">Client username</span>
 									<span class="component-desc">
-										<input type="text" name="torrent_username" id="torrent_username" value="$sickbeard.TORRENT_USERNAME" class="form-control input-sm input200" />
+										<input type="text" name="torrent_username" id="torrent_username" value="$sickbeard.TORRENT_USERNAME" class="form-control input-sm input200">
 										<p>(blank for none)</p>
 									</span>
 								</label>
@@ -433,7 +433,7 @@
 								<label>
 									<span class="component-title" id="password_title">Client password</span>
 									<span class="component-desc">
-										<input type="password" name="torrent_password" id="torrent_password" value="#echo '*' * len($sickbeard.TORRENT_PASSWORD)#" class="form-control input-sm input200" />
+										<input type="password" name="torrent_password" id="torrent_password" value="#echo '*' * len($sickbeard.TORRENT_PASSWORD)#" class="form-control input-sm input200">
 										<p>(blank for none)</p>
 									</span>
 								</label>
@@ -443,7 +443,7 @@
 								<label>
 									<span class="component-title">Add label to torrent</span>
 									<span class="component-desc">
-										<input type="text" name="torrent_label" id="torrent_label" value="$sickbeard.TORRENT_LABEL" class="form-control input-sm input200" />
+										<input type="text" name="torrent_label" id="torrent_label" value="$sickbeard.TORRENT_LABEL" class="form-control input-sm input200">
 										<span id="label_warning_deluge" style="display:none"><p>(blank spaces are not allowed)</p>
 											<div class="clear-left"><p>note: label plugin must be enabled in Deluge clients</p></div>
 										</span>
@@ -455,7 +455,7 @@
 								<label>
 									<span class="component-title" id="directory_title">Downloaded files location</span>
 									<span class="component-desc">
-										<input type="text" name="torrent_path" id="torrent_path" value="$sickbeard.TORRENT_PATH" class="form-control input-sm input350" />
+										<input type="text" name="torrent_path" id="torrent_path" value="$sickbeard.TORRENT_PATH" class="form-control input-sm input350">
 										<div class="clear-left"><p>where <span id="torrent_client">the torrent client</span> will save downloaded files (blank for client default)
 											<span id="path_synology"> <b>note:</b> the destination has to be a shared folder for Synology DS</span></p>
 										</div>
@@ -466,7 +466,7 @@
 							<div class="field-pair" id="torrent_seed_time_option">
 								<label>
 									<span class="component-title">Minimum seeding time is</span>
-									<span class="component-desc"><input type="number" step="0.1" name="torrent_seed_time" id="torrent_seed_time" value="$sickbeard.TORRENT_SEED_TIME" class="form-control input-sm input100" />
+									<span class="component-desc"><input type="number" step="0.1" name="torrent_seed_time" id="torrent_seed_time" value="$sickbeard.TORRENT_SEED_TIME" class="form-control input-sm input100">
 									<p>hours. (default:'0' passes blank to client and '-1' passes nothing)</p></span>
 								</label>
 							</div>
@@ -475,7 +475,7 @@
 								<label>
 									<span class="component-title">Start torrent paused</span>
 									<span class="component-desc">
-										<input type="checkbox" name="torrent_paused" class="enabler" id="torrent_paused" <%= html_checked if sickbeard.TORRENT_PAUSED == True else '' %>/>
+										<input type="checkbox" name="torrent_paused" class="enabler" id="torrent_paused"<%= html_checked if sickbeard.TORRENT_PAUSED == True else '' %>>
 										<p>add .torrent to client but do <b style="font-weight:900">not</b> start downloading</p>
 									</span>
 								</label>
@@ -485,23 +485,23 @@
 								<label>
 									<span class="component-title">Allow high bandwidth</span>
 									<span class="component-desc">
-										<input type="checkbox" name="torrent_high_bandwidth" class="enabler" id="torrent_high_bandwidth" <%= html_checked if sickbeard.TORRENT_HIGH_BANDWIDTH == True else '' %>/>
+										<input type="checkbox" name="torrent_high_bandwidth" class="enabler" id="torrent_high_bandwidth"<%= html_checked if sickbeard.TORRENT_HIGH_BANDWIDTH == True else '' %>>
 										<p>use high bandwidth allocation if priority is high</p>
 									</span>
 								</label>
 							</div>
 
 							<div class="testNotification" id="test_torrent_result">Click below to test</div>
-							<input class="btn" type="button" value="Test Connection" id="test_torrent" class="btn test-button"/>
-							<input type="submit" class="btn config_submitter" value="Save Changes" /><br/>
+							<input class="btn" type="button" value="Test Connection" id="test_torrent" class="btn test-button">
+							<input type="submit" class="btn config_submitter" value="Save Changes"><br />
 							</div>
 					</div><!-- /content_use_torrents //-->
 					</fieldset>
 				</div><!-- /component-group3 //-->
 
-				<br/>
+				<br />
 				<h6 class="pull-right"><b>All non-absolute folder locations are relative to <span class="path">$sickbeard.DATA_DIR</span></b> </h6>
-				<input type="submit" class="btn pull-left config_submitter button" value="Save Changes" />
+				<input type="submit" class="btn pull-left config_submitter button" value="Save Changes">
 
 			</div><!-- /config-components //-->