Fixed Soap formatting issues