improve search mappings