Fix char filter issues introduced during lucene 4 migration

Fixes #2543