adding code to populate ethnicity and source tables
fixed issue with switch between production and comprehension