Modified search and sort