Agency to begin more narrowly focused surveillance programme after stopping mass collection of data midnight on Sunday.