added current_location field in flat_table1 and flat_cohort_table