#85 improve filtering of AWSBOX logic