First batch of fixes on the simple search and bug list.