adding picture option and fixing content option
change for non-utf8