some big improvements to search