minor clean up
sort filter working
search is working