Fix search autodiscovery