Lots of changes for a faster search.