Improve SearchBuild() and mappings.