More fixes to the structured logging to es