Utf 8 fix, more rules