diff --git a/domain/search/search.go b/domain/search/search.go
index c1684db6..36eafbbb 100644
--- a/domain/search/search.go
+++ b/domain/search/search.go
@@ -24,7 +24,7 @@ func (m *Indexer) IndexDocument(ctx domain.RequestContext, d doc.Document, a []a
 	method := "search.IndexDocument"
 	var err error
 
-	ctx.Transaction, err = m.runtime.Db.Beginx()
+	tx, err := m.runtime.Db.Beginx()
 	if err != nil {
 		m.runtime.Log.Error(method, err)
 		return
@@ -32,12 +32,12 @@ func (m *Indexer) IndexDocument(ctx domain.RequestContext, d doc.Document, a []a
 
 	err = m.store.Search.IndexDocument(ctx, d, a)
 	if err != nil {
-		ctx.Transaction.Rollback()
+		tx.Rollback()
 		m.runtime.Log.Error(method, err)
 		return
 	}
 
-	ctx.Transaction.Commit()
+	tx.Commit()
 }
 
 // DeleteDocument removes all search entries for document.
@@ -45,7 +45,7 @@ func (m *Indexer) DeleteDocument(ctx domain.RequestContext, ID string) {
 	method := "search.DeleteDocument"
 	var err error
 
-	ctx.Transaction, err = m.runtime.Db.Beginx()
+	tx, err := m.runtime.Db.Beginx()
 	if err != nil {
 		m.runtime.Log.Error(method, err)
 		return
@@ -53,12 +53,12 @@ func (m *Indexer) DeleteDocument(ctx domain.RequestContext, ID string) {
 
 	err = m.store.Search.DeleteDocument(ctx, ID)
 	if err != nil {
-		ctx.Transaction.Rollback()
+		tx.Rollback()
 		m.runtime.Log.Error(method, err)
 		return
 	}
 
-	ctx.Transaction.Commit()
+	tx.Commit()
 }
 
 // IndexContent adds search index entry for document context.
@@ -67,7 +67,7 @@ func (m *Indexer) IndexContent(ctx domain.RequestContext, p page.Page) {
 	method := "search.IndexContent"
 	var err error
 
-	ctx.Transaction, err = m.runtime.Db.Beginx()
+	tx, err := m.runtime.Db.Beginx()
 	if err != nil {
 		m.runtime.Log.Error(method, err)
 		return
@@ -75,12 +75,12 @@ func (m *Indexer) IndexContent(ctx domain.RequestContext, p page.Page) {
 
 	err = m.store.Search.IndexContent(ctx, p)
 	if err != nil {
-		ctx.Transaction.Rollback()
+		tx.Rollback()
 		m.runtime.Log.Error(method, err)
 		return
 	}
 
-	ctx.Transaction.Commit()
+	tx.Commit()
 }
 
 // DeleteContent removes all search entries for specific document content.
@@ -88,7 +88,7 @@ func (m *Indexer) DeleteContent(ctx domain.RequestContext, pageID string) {
 	method := "search.DeleteContent"
 	var err error
 
-	ctx.Transaction, err = m.runtime.Db.Beginx()
+	tx, err := m.runtime.Db.Beginx()
 	if err != nil {
 		m.runtime.Log.Error(method, err)
 		return
@@ -96,10 +96,10 @@ func (m *Indexer) DeleteContent(ctx domain.RequestContext, pageID string) {
 
 	err = m.store.Search.DeleteContent(ctx, pageID)
 	if err != nil {
-		ctx.Transaction.Rollback()
+		tx.Rollback()
 		m.runtime.Log.Error(method, err)
 		return
 	}
 
-	ctx.Transaction.Commit()
-}
\ No newline at end of file
+	tx.Commit()
+}
diff --git a/gui/app/templates/components/document/document-meta.hbs b/gui/app/templates/components/document/document-meta.hbs
index af5b3db6..a28d9bd6 100644
--- a/gui/app/templates/components/document/document-meta.hbs
+++ b/gui/app/templates/components/document/document-meta.hbs
@@ -30,7 +30,7 @@
 			<div class="col-12 col-sm-3 heading">Tags</div>
 			<div class="col-12 col-sm-9 value">
 				{{#each tagz as |t index|}}
-					{{#link-to 'search' (query-params filter=t matchTag=true)}}
+					{{#link-to 'search' (query-params filter=t matchTag=true matchDoc=false matchContent=false matchAttachment=false)}}
 						{{concat '#' t}}
 					{{/link-to}}&nbsp;&nbsp;
 				{{/each}}