Fix search mappings