refactored XML service helper
fixed bug with inverted addresses