Filter escape characters - close #2