Highlighter - don't highlight stop words

I'm using a stop words filter and when making a query that contains a stop word the highlighter highlights the stop words, is it possible to stop this from happening but to allow the highlighter to continue to highlight if it's a phrase search?

Try using an analyzer in the "highlight" query:

"highlight": { "fields": { "text_content": { "fragment_size": 50, "number_of_fragments": 5 } }, "highlight_query": { "bool": { "must": [ { "match": { "content": { "query": "test phrase", "analyzer": "english" } } } ] } } }