diff --git a/src/invoices/InvoicesList/constants.js b/src/invoices/InvoicesList/constants.js
index a20bc7e1..7a0f4c6e 100644
--- a/src/invoices/InvoicesList/constants.js
+++ b/src/invoices/InvoicesList/constants.js
@@ -16,4 +16,5 @@ export const FILTERS = {
   FUND_CODE: 'fundCode',
   LOCK_TOTAL: 'lockTotal',
   FISCAL_YEAR: 'fiscalYearId',
+  INVOICE_LINE_TAGS: 'invoiceLines.tags.tagList',
 };
diff --git a/src/invoices/InvoicesList/hooks/useBuildQuery/useBuildQuery.js b/src/invoices/InvoicesList/hooks/useBuildQuery/useBuildQuery.js
index a600c7bb..7b068eb2 100644
--- a/src/invoices/InvoicesList/hooks/useBuildQuery/useBuildQuery.js
+++ b/src/invoices/InvoicesList/hooks/useBuildQuery/useBuildQuery.js
@@ -12,9 +12,10 @@ import { getKeywordQuery } from '../../InvoicesListSearchConfig';
 import { FILTERS } from '../../constants';
 
 function getQueryForTags(filterValue) {
-  const value = Array.isArray(filterValue) ? `(${filterValue.map(v => `"*${v}*"`).join(' or ')})` : `"*${filterValue}*"`;
+  const tagsQuery = buildArrayFieldQuery(FILTERS.TAGS, filterValue);
+  const invoiceLineTagsQuery = buildArrayFieldQuery(FILTERS.INVOICE_LINE_TAGS, filterValue);
 
-  return `${FILTERS.TAGS}==${value} or invoiceLines.tags.tagList==${value}`;
+  return `${tagsQuery} or ${invoiceLineTagsQuery}`;
 }
 
 export const useBuildQuery = () => {