Better search and added sort feature.