NOREF: Restructuring the data filters and better parameterizing the AWS values