progress on Lucene upgrades