Pwh/aws

Added additional output filters.