proper grouping to index correctly

- also STORE all fields in Lucene