Added sort and search feature