Fixing elasticsearch indexing, refs #23