Sorting improvement, home user used by default