--- a/src/pyams_content/root/zmi/templates/advanced-search.pt	Tue Aug 28 16:19:33 2018 +0200
+++ b/src/pyams_content/root/zmi/templates/advanced-search.pt	Tue Aug 28 17:24:59 2018 +0200
@@ -102,8 +102,10 @@
 										</div>
 									</div>
 								</tal:var>
+							</div>
+							<div class="form-group">
 								<tal:var define="widget view.widgets['content_type']">
-									<label class="control-label col-md-2">
+									<label class="control-label col-md-3">
 										<span>
 											<tal:var content="widget.label" />
 											<i class="fa fa-question-circle hint" title="Input hint"
@@ -113,7 +115,7 @@
 															   data-ams-hint-html '<' in description;"></i>
 										</span>
 									</label>
-									<div class="col-md-3">
+									<div class="col-md-4">
 										<div class="input"
 											 tal:attributes="class widget.widget_css_class | default;
 															 data-ams-data tales:object_data(widget);
@@ -175,6 +177,13 @@
 									</div>
 								</div>
 							</div>
+							<fieldset tal:condition="'tags' in view.widgets">
+								<legend class="switcher" i18n:translate="">Tags</legend>
+								<div class="input"
+									 tal:define="widget view.widgets['tags']">
+									<input tal:replace="structure widget.render()" />
+								</div>
+							</fieldset>
 						</fieldset>
 					</tal:loop>
 					<div class="widgets-suffix"