refactoring layers, highlight subcounty layer [#56612548]