removed indicator-group from where clause in datapoints_cp
added NO and IS to country profile