Updated to get better results for country

Change-Id: I46b34af62cc933d92563370f0c5ca41dd8892375