How to make autocomplete suggestion return relevant results for whole PHRASE not just for each word separately ?

Hello,

Has someone faced with the problem, to make autocomplete suggestion return relevant results for PHRASES not just for each word separately (any hybris version higher than 5.5)?
For instance right now using hybris 6.2 without any config changes, the customer would like to find "hammer drill" and starts typing and sees for "hammer d" next result:

"hammer direct" isn't relevant suggestion because "hammer" and "direct" it is 2 different types of products. Search result for "direct":




For hybris 5.2(lucene version 4.5) I managed to configure autosuggester returns relevant results using AnalyzingInfixSuggester. But now for lucene version > 4.8 there is a bug https://issues.apache.org/jira/browse/SOLR-6246 and AnalyzingInfixSuggester no longer works properly. Now I am looking another solution for hybris 6.2 (lucene version 6.1) how to get accurate auto suggestion for a phrase. I would appreciate any thought, idea how to make auto suggestion returns relevant results. What component, lookupImpl, dictionaryImpl, factory, filters would better to use?

Thanks.