Issue 1143: Fix non-fandom sorting

Issue 1143: Fix non-fandom sorting