fix build_data_table keys