Fixing up elasticsearch