Fix ES mapping for start/end