diff --git a/components/com_search/views/search/tmpl/default.php b/components/com_search/views/search/tmpl/default.php
index 4fd0a2c62eda7..d7266b0076735 100644
--- a/components/com_search/views/search/tmpl/default.php
+++ b/components/com_search/views/search/tmpl/default.php
@@ -8,24 +8,24 @@
  */
 
 defined('_JEXEC') or die;
+
 JHtml::_('formbehavior.chosen', 'select');
-?>
 
+?>
 <div class="search<?php echo $this->pageclass_sfx; ?>">
-<?php if ($this->params->get('show_page_heading')) : ?>
-<h1 class="page-title">
-	<?php if ($this->escape($this->params->get('page_heading'))) : ?>
-		<?php echo $this->escape($this->params->get('page_heading')); ?>
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<h1 class="page-title">
+			<?php if ($this->escape($this->params->get('page_heading'))) : ?>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			<?php else : ?>
+				<?php echo $this->escape($this->params->get('page_title')); ?>
+			<?php endif; ?>
+		</h1>
+	<?php endif; ?>
+	<?php echo $this->loadTemplate('form'); ?>
+	<?php if ($this->error == null && count($this->results) > 0) : ?>
+		<?php echo $this->loadTemplate('results'); ?>
 	<?php else : ?>
-		<?php echo $this->escape($this->params->get('page_title')); ?>
+		<?php echo $this->loadTemplate('error'); ?>
 	<?php endif; ?>
-</h1>
-<?php endif; ?>
-
-<?php echo $this->loadTemplate('form'); ?>
-<?php if ($this->error == null && count($this->results) > 0) :
-	echo $this->loadTemplate('results');
-else :
-	echo $this->loadTemplate('error');
-endif; ?>
 </div>
diff --git a/components/com_search/views/search/tmpl/default_error.php b/components/com_search/views/search/tmpl/default_error.php
index 126b52528ab26..9fa2eed4d7784 100644
--- a/components/com_search/views/search/tmpl/default_error.php
+++ b/components/com_search/views/search/tmpl/default_error.php
@@ -8,10 +8,10 @@
  */
 
 defined('_JEXEC') or die;
-?>
 
+?>
 <?php if ($this->error) : ?>
-<div class="error">
-			<?php echo $this->escape($this->error); ?>
-</div>
+	<div class="error">
+		<?php echo $this->escape($this->error); ?>
+	</div>
 <?php endif; ?>
diff --git a/components/com_search/views/search/tmpl/default_form.php b/components/com_search/views/search/tmpl/default_form.php
index 108a5120c7e59..91bd27c38bac3 100644
--- a/components/com_search/views/search/tmpl/default_form.php
+++ b/components/com_search/views/search/tmpl/default_form.php
@@ -13,68 +13,68 @@
 
 $lang = JFactory::getLanguage();
 $upper_limit = $lang->getUpperLimitSearchWord();
+
 ?>
 <form id="searchForm" action="<?php echo JRoute::_('index.php?option=com_search'); ?>" method="post">
-
 	<div class="btn-toolbar">
 		<div class="btn-group pull-left">
 			<input type="text" name="searchword" title="<?php echo JText::_('COM_SEARCH_SEARCH_KEYWORD'); ?>" placeholder="<?php echo JText::_('COM_SEARCH_SEARCH_KEYWORD'); ?>" id="search-searchword" size="30" maxlength="<?php echo $upper_limit; ?>" value="<?php echo $this->escape($this->origkeyword); ?>" class="inputbox" />
 		</div>
 		<div class="btn-group pull-left">
-			<button name="Search" onclick="this.form.submit()" class="btn hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_SEARCH_SEARCH');?>"><span class="icon-search"></span><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button name="Search" onclick="this.form.submit()" class="btn hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_SEARCH_SEARCH');?>">
+				<span class="icon-search"></span>
+				<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>
+			</button>
 		</div>
 		<input type="hidden" name="task" value="search" />
 		<div class="clearfix"></div>
 	</div>
-
 	<div class="searchintro<?php echo $this->params->get('pageclass_sfx'); ?>">
 		<?php if (!empty($this->searchword)) : ?>
-		<p><?php echo JText::plural('COM_SEARCH_SEARCH_KEYWORD_N_RESULTS', '<span class="badge badge-info">' . $this->total . '</span>'); ?></p>
+			<p>
+				<?php echo JText::plural('COM_SEARCH_SEARCH_KEYWORD_N_RESULTS', '<span class="badge badge-info">' . $this->total . '</span>'); ?>
+			</p>
 		<?php endif; ?>
 	</div>
-
 	<?php if ($this->params->get('search_phrases', 1)) : ?>
 		<fieldset class="phrases">
-			<legend><?php echo JText::_('COM_SEARCH_FOR'); ?>
+			<legend>
+				<?php echo JText::_('COM_SEARCH_FOR'); ?>
 			</legend>
-				<div class="phrases-box">
+			<div class="phrases-box">
 				<?php echo $this->lists['searchphrase']; ?>
-				</div>
-				<div class="ordering-box">
+			</div>
+			<div class="ordering-box">
 				<label for="ordering" class="ordering">
 					<?php echo JText::_('COM_SEARCH_ORDERING'); ?>
 				</label>
 				<?php echo $this->lists['ordering']; ?>
-				</div>
+			</div>
 		</fieldset>
 	<?php endif; ?>
-
 	<?php if ($this->params->get('search_areas', 1)) : ?>
 		<fieldset class="only">
-			<legend><?php echo JText::_('COM_SEARCH_SEARCH_ONLY'); ?></legend>
-			<?php foreach ($this->searchareas['search'] as $val => $txt) :
-				$checked = is_array($this->searchareas['active']) && in_array($val, $this->searchareas['active']) ? 'checked="checked"' : '';
-			?>
-			<label for="area-<?php echo $val; ?>" class="checkbox">
-				<input type="checkbox" name="areas[]" value="<?php echo $val; ?>" id="area-<?php echo $val; ?>" <?php echo $checked; ?> >
-				<?php echo JText::_($txt); ?>
-			</label>
+			<legend>
+				<?php echo JText::_('COM_SEARCH_SEARCH_ONLY'); ?>
+			</legend>
+			<?php foreach ($this->searchareas['search'] as $val => $txt) : ?>
+				<?php $checked = is_array($this->searchareas['active']) && in_array($val, $this->searchareas['active']) ? 'checked="checked"' : ''; ?>
+				<label for="area-<?php echo $val; ?>" class="checkbox">
+					<input type="checkbox" name="areas[]" value="<?php echo $val; ?>" id="area-<?php echo $val; ?>" <?php echo $checked; ?> />
+					<?php echo JText::_($txt); ?>
+				</label>
 			<?php endforeach; ?>
 		</fieldset>
 	<?php endif; ?>
-
-<?php if ($this->total > 0) : ?>
-
-	<div class="form-limit">
-		<label for="limit">
-			<?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>
-		</label>
-		<?php echo $this->pagination->getLimitBox(); ?>
-	</div>
-<p class="counter">
-		<?php echo $this->pagination->getPagesCounter(); ?>
-	</p>
-
-<?php endif; ?>
-
+	<?php if ($this->total > 0) : ?>
+		<div class="form-limit">
+			<label for="limit">
+				<?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>
+			</label>
+			<?php echo $this->pagination->getLimitBox(); ?>
+		</div>
+		<p class="counter">
+			<?php echo $this->pagination->getPagesCounter(); ?>
+		</p>
+	<?php endif; ?>
 </form>
diff --git a/components/com_search/views/search/tmpl/default_results.php b/components/com_search/views/search/tmpl/default_results.php
index 0adbb0f28824d..037f8e9fade16 100644
--- a/components/com_search/views/search/tmpl/default_results.php
+++ b/components/com_search/views/search/tmpl/default_results.php
@@ -8,8 +8,8 @@
  */
 
 defined('_JEXEC') or die;
-?>
 
+?>
 <dl class="search-results<?php echo $this->pageclass_sfx; ?>">
 <?php foreach ($this->results as $result) : ?>
 	<dt class="result-title">
@@ -22,8 +22,8 @@
 				<?php echo $result->title; ?>
 			</a>
 		<?php else : ?>
-		       <?php // see above comment: do not escape $result->title ?>
-		       <?php echo $result->title; ?>
+			<?php // see above comment: do not escape $result->title ?>
+			<?php echo $result->title; ?>
 		<?php endif; ?>
 	</dt>
 	<?php if ($result->section) : ?>
@@ -43,7 +43,6 @@
 	<?php endif; ?>
 <?php endforeach; ?>
 </dl>
-
 <div class="pagination">
 	<?php echo $this->pagination->getPagesLinks(); ?>
 </div>