Added search and sort to boundaries