Fix sort when browsing (#50)
Merge branch 'fix-#50' into all