Move 'search' to the registry subsystem