removed indicator-group from where clause in datapoints_cp
Merge branch 'devel-fix'