Port fixes from search_lucene repo