data_api fixed