Added query part
Upgraded to use Lucene 5