Addressed output filtering issues.