Fix for bug when data collection id is None