more mappings for search and a slightly improved linkage mechanics.