Country value displays if it exists. Tidy up tab/space mixture
pagination options added to manifest