Bug fixes with search system.