Eliminate the countries and modern counties

Both in search and DAP