USERGRID-2099: fix to make existing data return without CCE