diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index ed7d71f0c..67d57ef18 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -341,6 +341,7 @@ function typeahead() { /* {{{ */
 		$content = ob_get_clean();
 		$this->printAccordion(getMLText('filter_for_documents_and_folders'), $content, $openfilterdlg);
 
+		// Seach options for documents {{{
 		/* First check if any of the folder filters are set. If it is,
 		 * open the accordion.
 		 */
@@ -438,8 +439,9 @@ function typeahead() { /* {{{ */
 				}
 			}
 		}
-?>
-<?php
+		// }}}
+
+		// Seach options for folders {{{
 		$content = ob_get_clean();
 		$this->printAccordion(getMLText('filter_for_documents'), $content, $openfilterdlg);
 		/* First check if any of the folder filters are set. If it is,
@@ -477,6 +479,10 @@ function typeahead() { /* {{{ */
 </form>
 		</div>
 <?php
+		// }}}
+		// }}}
+
+		// Fulltext search Form {{{
 		if($enablefullsearch) {
 	  	echo "<div class=\"tab-pane ".(($fullsearch == true) ? 'active' : '')."\" id=\"fulltext\">\n";
 ?>
@@ -621,6 +627,7 @@ function typeahead() { /* {{{ */
 <?php
 			echo "</div>\n";
 		}
+		// }}}
 ?>
 	</div>
 <?php