Correct codification handling

So far for text content only