updated implementation for new lucene