diff --git a/nameserver/response.go b/nameserver/response.go
index d78888c8..92dd80af 100644
--- a/nameserver/response.go
+++ b/nameserver/response.go
@@ -28,6 +28,8 @@ func sendResponse(
 		return nil
 	}
 	// Signify that we are a recursive resolver.
+	// While we do not handle recursion directly, we can safely assume, that we
+	// always forward to a recursive resolver.
 	reply.RecursionAvailable = true
 
 	// Add extra RRs through a custom RRProvider.
diff --git a/resolver/resolvers.go b/resolver/resolvers.go
index 2e66b332..0f7eaa16 100644
--- a/resolver/resolvers.go
+++ b/resolver/resolvers.go
@@ -205,12 +205,15 @@ func createResolver(resolverURL, source string) (*Resolver, bool, error) {
 }
 
 func configureSearchDomains(resolver *Resolver, searches []string, hardfail bool) error {
+	resolver.Search = make([]string, 0, len(searches))
+
 	// Check all search domains.
 	for i, value := range searches {
 		trimmedDomain := strings.ToLower(strings.Trim(value, "."))
 		err := checkSearchScope(trimmedDomain)
 		if err != nil {
 			if hardfail {
+				resolver.Search = nil
 				return fmt.Errorf("failed to validate search domain #%d: %w", i+1, err)
 			}
 			log.Warningf("resolver: skipping invalid search domain for resolver %s: %s", resolver, utils.SafeFirst16Chars(value))
diff --git a/updates/upgrader.go b/updates/upgrader.go
index a97f89a9..aabc2441 100644
--- a/updates/upgrader.go
+++ b/updates/upgrader.go
@@ -117,6 +117,7 @@ func upgradeCoreNotify() error {
 			),
 			ShowOnSystem: true,
 			AvailableActions: []*notifications.Action{
+				// TODO: Use special UI action in order to reload UI on restart.
 				{
 					ID:   "restart",
 					Text: "Restart",