Finished update to country and ethnic to handle database numbers