utf-8 and filter

Here's the changes I mentioned int the email. Hope it can be used.