fixes #3438, fix sorting of entries, revert bogus modifications, see [26203]

git-svn-id: svn://develop.studip.de/studip/trunk@26210 c5b85792-5220-0410-ad23-ed5b6b8ad999
fixes #3377

git-svn-id: svn://develop.studip.de/studip/trunk@26211 c5b85792-5220-0410-ad23-ed5b6b8ad999