Fix defaultsort errors, especially with relation to de-referencing magicword_defaultsort