Improve filtration of special characters (see Issue #30)