Fixes #2
Fixes #5
sorting of users