add more complete support for es index