Add sort and search