Added sort for public view as well