Fixed issue with address information containing spaces.