SOAP V2 image mapping fixes