adding back the query to get all data for cfd