Set up search and added name sort