change field analys and fix encoding