updates related to encoding issues