Add sort and search
Add Sort and Search