final fix to support lucene search