Apologies for the late response as this mail was lost somewhere in filters.
Issue was that CommonGramsQueryFilterFactory should be used for searching and CommonGramsFilterFactory for indexing. We were using CommonGramsFilterFactory for both due to which it was not dropping single tokens for common grams in a phrase query. I will go through the link you sent and see if it needs any explanation. Thanks!
