Revision of lucene2xml(), based on Ron's update 2014-05-20