Fix search settings naming issues