Add custom mappings to make search actually work