improve elasticsearch support.