Fix searching and another bug.