CDAP-528: add scope before exclusions