more es index and mapping work