added elasticsearch fixes