diff --git a/frappe/templates/includes/search_template.html b/frappe/templates/includes/search_template.html
index 9e0994792b..b756c96695 100644
--- a/frappe/templates/includes/search_template.html
+++ b/frappe/templates/includes/search_template.html
@@ -1,15 +1,15 @@
 <h1>{{ title }}</h1>
 
 {%- macro search_results_section(results, title, has_more) -%}
-	<div class='search-result col-sm-6'>
+	<div class="search-result col-sm-6">
 		{% if title %}
-		<h3 style="margin-bottom: 30px">{{ title }}</h3>
+		<h3 class="mb-4">{{ title }}</h3>
 		{% endif %}
 
 		{% for d in results %}
-		<div class="search-result-item" style="padding-bottom: 15px;">
+		<div class="search-result-item mb-4">
 			<a href="{{ d.route }}"><b>{{ d.title }}</b></a>
-			<p>{{ d.preview }}</p>
+			<p class="m-0">{{ d.preview }}</p>
 		</div>
 		{% endfor %}
 		{% if has_more %}
@@ -19,15 +19,20 @@
 	</div>
 {%- endmacro %}
 
-<div style="margin-bottom: 30px">
-	<form action='{{ route }}'>
-	<input name='q' class='form-control' type='text'
-		style='max-width: 400px; display: inline-block; margin-right: 10px;'
-		value='{{ query or ''}}'
-		{% if not query %}placeholder="{{ _("Search...") }}"{% endif %}>
-	<input type='submit'
-		class='btn btn-sm btn-primary btn-search' value="{{ _("Search") }}">
-	</form>
+<div class="row mb-5">
+	<div class="col-sm-6">
+		<form action="{{ route }}">
+			<div class="input-group">
+				<input name="q" class="form-control" type="text" value="{{ query or ''}}"
+					placeholder="{{ _('Search...') }}">
+				<div class="input-group-append">
+					<button type="submit" class="btn btn-sm btn-primary btn-search">
+						{{ _('Search') }}
+					</button>
+				</div>
+			</div>
+		</form>
+	</div>
 </div>
 
 {% if results %}
diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py
index 76f433cf80..af38570021 100644
--- a/frappe/utils/global_search.py
+++ b/frappe/utils/global_search.py
@@ -311,16 +311,26 @@ def sync_value(value):
 	Sync a given document to global search
 	:param value: dict of { doctype, name, content, published, title, route }
 	'''
-	
+
 	frappe.db.multisql({
 		'mariadb': '''INSERT INTO `__global_search`
 			(`doctype`, `name`, `content`, `published`, `title`, `route`)
 			VALUES (%(doctype)s, %(name)s, %(content)s, %(published)s, %(title)s, %(route)s)
-			ON DUPLICATE key UPDATE `content`=%(content)s''',
+			ON DUPLICATE key UPDATE
+				`content`=%(content)s,
+				`published`=%(published)s,
+				`title`=%(title)s,
+				`route`=%(route)s
+		''',
 		'postgres': '''INSERT INTO `__global_search`
 			(`doctype`, `name`, `content`, `published`, `title`, `route`)
 			VALUES (%(doctype)s, %(name)s, %(content)s, %(published)s, %(title)s, %(route)s)
-			ON CONFLICT("doctype", "name") DO UPDATE SET `content`=%(content)s'''
+			ON CONFLICT("doctype", "name") DO UPDATE SET
+				`content`=%(content)s,
+				`published`=%(published)s,
+				`title`=%(title)s,
+				`route`=%(route)s
+		'''
 	}, value)
 
 def delete_for_document(doc):
diff --git a/frappe/www/search.py b/frappe/www/search.py
index 56b6ff4e36..e545f4840f 100644
--- a/frappe/www/search.py
+++ b/frappe/www/search.py
@@ -29,7 +29,7 @@ def get_search_results(text, start=0, as_html=False):
 	for d in results:
 		d.content = html2text(d.content)
 		index = d.content.lower().index(text.lower())
-		d.content = d.content[:index] + '<b>' + d.content[index:][:len(text)] + '</b>' + d.content[index + len(text):]
+		d.content = d.content[:index] + '<mark>' + d.content[index:][:len(text)] + '</mark>' + d.content[index + len(text):]
 
 		if index < 40:
 			start = 0