Add partial fix to word and sort models