try to improve elasticsearch support