Mapify objects for search
Dare I say it? First pass of partial search seems to work.