Fixes search and set to use ICU message format