sorting, search added