fixing translation with undefined and null
fixing handling model previous