removed non-functional 'change option'
Added elasticsearch _ fields to table, eg _id, _index, _type
Merge remote-tracking branch 'upstream/master'