Correct way to handle faceted search tokenization issue for dynamic fields?