diff --git a/less/search.less b/less/search.less
index 1ba029a..43e1b91 100644
--- a/less/search.less
+++ b/less/search.less
@@ -7,6 +7,12 @@
 			display: block;
 		}
 	}
+
+	#advanced-search {
+		.panel-heading {
+			cursor: pointer;
+		}
+	}
 }
 
 .search-result-title {
diff --git a/templates/partials/flags/filters.tpl b/templates/partials/flags/filters.tpl
index 13282c1..6e7bcb2 100644
--- a/templates/partials/flags/filters.tpl
+++ b/templates/partials/flags/filters.tpl
@@ -3,7 +3,7 @@
 		<div class="panel-body collapse" id="flags-daily-wrapper" aria-expanded="false">
 			<div><canvas id="flags:daily" height="150"></canvas></div>
 		</div>
-		<div class="panel-footer" aria-controls="#flags-daily-wrapper"><small>[[flags:graph-label]]</small>&nbsp;<span class="caret"></span></div>
+		<div class="panel-footer" data-toggle="collapse" data-target="#flags-daily-wrapper" aria-controls="#flags-daily-wrapper"><small>[[flags:graph-label]]</small>&nbsp;<i class="fa fa-sort"></i></div>
 	</div>
 </div>
 
@@ -65,24 +65,28 @@
 				</div>
 			</fieldset>
 
-			<fieldset class="collapse" id="more-filters" aria-expanded="false">
+			<fieldset class="collapse{{{ if expanded }}} in{{{ end }}}" id="more-filters" aria-expanded="{expanded}">
 				<div class="form-group">
 					<label for="filter-assignee">[[flags:filter-assignee]]</label>
-					<input type="number" class="form-control" id="filter-assignee" name="assignee" min="0" />
+					<input type="text" class="form-control" id="filter-assignee" name="assignee" />
 				</div>
 
 				<div class="form-group">
 					<label for="filter-targetUid">[[flags:filter-targetUid]]</label>
-					<input type="number" class="form-control" id="filter-targetUid" name="targetUid" min="0" />
+					<input type="text" class="form-control" id="filter-targetUid" name="targetUid" />
 				</div>
 
 				<div class="form-group">
 					<label for="filter-reporterId">[[flags:filter-reporterId]]</label>
-					<input type="number" class="form-control" id="filter-reporterId" name="reporterId" min="0" />
+					<input type="text" class="form-control" id="filter-reporterId" name="reporterId" />
 				</div>
 			</fieldset>
 
-			<button type="button" class="btn btn-link btn-block" data-toggle="collapse" data-target="#more-filters" aria-controls="#more-filters">[[flags:more-filters]]&nbsp;<span class="caret"></span></button>
+			{{{ if expanded }}}
+			<button type="button" class="btn btn-link btn-block" data-toggle="collapse" data-target="#more-filters" aria-controls="#more-filters" data-text-variant="[[flags:more-filters]] ">[[flags:fewer-filters]]&nbsp;<i class="fa fa-sort"></i></button>
+			{{{ else }}}
+			<button type="button" class="btn btn-link btn-block" data-toggle="collapse" data-target="#more-filters" aria-controls="#more-filters" data-text-variant="[[flags:fewer-filters]] ">[[flags:more-filters]]&nbsp;<i class="fa fa-sort"></i></button>
+			{{{ end }}}
 			<button type="button" id="apply-filters" class="btn btn-primary btn-block">[[flags:apply-filters]]</button>
 		</form>
 	</div>
diff --git a/templates/search.tpl b/templates/search.tpl
index 6f2ac42..c3f72e0 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -41,7 +41,7 @@
 
 				<div class="panel panel-default">
 					<div class="panel-heading" data-toggle="collapse" data-target=".search-options">
-						<h3 class="panel-title"><i class="fa fa-caret-down"></i> [[search:advanced-search]]</h3>
+						<h3 class="panel-title"><i class="fa fa-sort"></i> [[search:advanced-search]]</h3>
 					</div>
 					<div class="panel-body search-options collapse <!-- IF expandSearch -->in<!-- ENDIF expandSearch -->">
 						<div class="form-group post-search-item">