Make demo use UTF-8, add problem case
Factor out find and wrap code (partially done)