Updated some search mappings to use plugins now