Revert "sort and search"

This reverts commit 9bf9150d644a887d254f3aad955d23764d62c42c.