Corrected ES default mapping naming
Renamed webserver fieldnames and added mapping for combined-psi