Add Country to address if available. tidy up tab/space mixture
pagination options added to manifest
return whitespace before zipcode