Added non standalone country and state.
Fixed scrub algorithm