0005631: Category default sorting leads to empty category lists when switching languages (cherry picked from commit aefdf5f)