bug fixes in get_data + organization