Fix DEFAULTSORT conflicts