Added county auto resolution