KHRES-309 #comment fix the ''by country code'' sql query so that it's much faster