elasticsearch fixes