diff --git a/changelog.d/5-internal/typos-etc b/changelog.d/5-internal/typos-etc
new file mode 100644
index 00000000000..5a7f48cce9a
--- /dev/null
+++ b/changelog.d/5-internal/typos-etc
@@ -0,0 +1 @@
+Fix typos, dangling reference in source code haddocs, etc.
\ No newline at end of file
diff --git a/docs/legacy/reference/user/registration.md b/docs/legacy/reference/user/registration.md
index fee8c310227..d4451611199 100644
--- a/docs/legacy/reference/user/registration.md
+++ b/docs/legacy/reference/user/registration.md
@@ -192,7 +192,7 @@ The rest of the unauthorized end-points is safe:
 - `~* ^/teams/invitations/info$`: only `GET`; requires invitation code.
 - `~* ^/teams/invitations/by-email$`: only `HEAD`.
 - `/invitations/info`: discontinued feature, can be removed from nginz config.
-- `/conversations/code-check`: link validatoin for ephemeral/guest users.
+- `/conversations/code-check`: link validation for ephemeral/guest users.
 - `/provider/*`: bots need to be registered to a team before becoming active.  so if an attacker does not get access to a team, they cannot deploy a bot.
 - `~* ^/custom-backend/by-domain/([^/]*)$`: only `GET`; only exposes a list of domains that has is maintained through an internal end-point.  used to redirect stock clients from the cloud instance to on-prem instances.
 - `~* ^/teams/api-docs`: only `GET`; swagger for part of the rest API.  safe: it is trivial to identify the software that is running on the instance, and from there it is trivial to get to the source on github, where this can be obtained easily, and more.
diff --git a/libs/galley-types/src/Galley/Types/Teams.hs b/libs/galley-types/src/Galley/Types/Teams.hs
index ce1f686034e..a06c1b0ea0e 100644
--- a/libs/galley-types/src/Galley/Types/Teams.hs
+++ b/libs/galley-types/src/Galley/Types/Teams.hs
@@ -178,8 +178,6 @@ data FeatureLegalHold
   deriving (Eq, Ord, Show, Enum, Bounded, Generic)
 
 -- | Default value for all teams that have not enabled or disabled this feature explicitly.
--- See also 'Wire.API.Team.SearchVisibility.TeamSearchVisibilityEnabled',
--- 'Wire.API.Team.SearchVisibility.TeamSearchVisibility'.
 data FeatureTeamSearchVisibilityAvailability
   = FeatureTeamSearchVisibilityAvailableByDefault
   | FeatureTeamSearchVisibilityUnavailableByDefault
diff --git a/libs/wire-api/src/Wire/API/Team/Feature.hs b/libs/wire-api/src/Wire/API/Team/Feature.hs
index fecff851f29..1e93517788b 100644
--- a/libs/wire-api/src/Wire/API/Team/Feature.hs
+++ b/libs/wire-api/src/Wire/API/Team/Feature.hs
@@ -997,6 +997,7 @@ data AllFeatureConfigs = AllFeatureConfigs
   { afcLegalholdStatus :: WithStatus LegalholdConfig,
     afcSSOStatus :: WithStatus SSOConfig,
     afcTeamSearchVisibilityAvailable :: WithStatus SearchVisibilityAvailableConfig,
+    afcSearchVisibilityInboundConfig :: WithStatus SearchVisibilityInboundConfig,
     afcValidateSAMLEmails :: WithStatus ValidateSAMLEmailsConfig,
     afcDigitalSignatures :: WithStatus DigitalSignaturesConfig,
     afcAppLock :: WithStatus AppLockConfig,
@@ -1006,8 +1007,7 @@ data AllFeatureConfigs = AllFeatureConfigs
     afcSelfDeletingMessages :: WithStatus SelfDeletingMessagesConfig,
     afcGuestLink :: WithStatus GuestLinksConfig,
     afcSndFactorPasswordChallenge :: WithStatus SndFactorPasswordChallengeConfig,
-    afcMLS :: WithStatus MLSConfig,
-    afcSearchVisibilityInboundConfig :: WithStatus SearchVisibilityInboundConfig
+    afcMLS :: WithStatus MLSConfig
   }
   deriving stock (Eq, Show)
   deriving (FromJSON, ToJSON, S.ToSchema) via (Schema AllFeatureConfigs)
@@ -1019,6 +1019,7 @@ instance ToSchema AllFeatureConfigs where
         <$> afcLegalholdStatus .= featureField
         <*> afcSSOStatus .= featureField
         <*> afcTeamSearchVisibilityAvailable .= featureField
+        <*> afcSearchVisibilityInboundConfig .= featureField
         <*> afcValidateSAMLEmails .= featureField
         <*> afcDigitalSignatures .= featureField
         <*> afcAppLock .= featureField
@@ -1029,7 +1030,6 @@ instance ToSchema AllFeatureConfigs where
         <*> afcGuestLink .= featureField
         <*> afcSndFactorPasswordChallenge .= featureField
         <*> afcMLS .= featureField
-        <*> afcSearchVisibilityInboundConfig .= featureField
     where
       featureField ::
         forall cfg.
diff --git a/libs/wire-api/src/Wire/API/Team/SearchVisibility.hs b/libs/wire-api/src/Wire/API/Team/SearchVisibility.hs
index 90e67cece18..fe641c96704 100644
--- a/libs/wire-api/src/Wire/API/Team/SearchVisibility.hs
+++ b/libs/wire-api/src/Wire/API/Team/SearchVisibility.hs
@@ -60,7 +60,7 @@ import Wire.API.Arbitrary (Arbitrary, GenericUniform (..))
 --     Name: can be found by same team only
 -- @
 --
--- See also: 'FeatureTeamSearchVisibility', 'TeamSearchVisibilityEnabled'.
+-- See also: 'FeatureTeamSearchVisibilityAvailability'.
 data TeamSearchVisibility
   = SearchVisibilityStandard
   | SearchVisibilityNoNameOutsideTeam
diff --git a/services/galley/src/Galley/API/Teams/Features.hs b/services/galley/src/Galley/API/Teams/Features.hs
index b3dc7ed0b33..4085b746fdb 100644
--- a/services/galley/src/Galley/API/Teams/Features.hs
+++ b/services/galley/src/Galley/API/Teams/Features.hs
@@ -427,6 +427,7 @@ getAllFeatureConfigsForServer =
     <$> getConfigForServer @db @LegalholdConfig
     <*> getConfigForServer @db @SSOConfig
     <*> getConfigForServer @db @SearchVisibilityAvailableConfig
+    <*> getConfigForServer @db @SearchVisibilityInboundConfig
     <*> getConfigForServer @db @ValidateSAMLEmailsConfig
     <*> getConfigForServer @db @DigitalSignaturesConfig
     <*> getConfigForServer @db @AppLockConfig
@@ -437,7 +438,6 @@ getAllFeatureConfigsForServer =
     <*> getConfigForServer @db @GuestLinksConfig
     <*> getConfigForServer @db @SndFactorPasswordChallengeConfig
     <*> getConfigForServer @db @MLSConfig
-    <*> getConfigForServer @db @SearchVisibilityInboundConfig
 
 getAllFeatureConfigsUser ::
   forall db r.
@@ -460,6 +460,7 @@ getAllFeatureConfigsUser uid =
     <$> getConfigForUser @db @LegalholdConfig uid
     <*> getConfigForUser @db @SSOConfig uid
     <*> getConfigForUser @db @SearchVisibilityAvailableConfig uid
+    <*> getConfigForUser @db @SearchVisibilityInboundConfig uid
     <*> getConfigForUser @db @ValidateSAMLEmailsConfig uid
     <*> getConfigForUser @db @DigitalSignaturesConfig uid
     <*> getConfigForUser @db @AppLockConfig uid
@@ -470,7 +471,6 @@ getAllFeatureConfigsUser uid =
     <*> getConfigForUser @db @GuestLinksConfig uid
     <*> getConfigForUser @db @SndFactorPasswordChallengeConfig uid
     <*> getConfigForUser @db @MLSConfig uid
-    <*> getConfigForUser @db @SearchVisibilityInboundConfig uid
 
 getAllFeatureConfigsTeam ::
   forall db r.
@@ -492,6 +492,7 @@ getAllFeatureConfigsTeam tid =
     <$> getConfigForTeam @db @LegalholdConfig tid
     <*> getConfigForTeam @db @SSOConfig tid
     <*> getConfigForTeam @db @SearchVisibilityAvailableConfig tid
+    <*> getConfigForTeam @db @SearchVisibilityInboundConfig tid
     <*> getConfigForTeam @db @ValidateSAMLEmailsConfig tid
     <*> getConfigForTeam @db @DigitalSignaturesConfig tid
     <*> getConfigForTeam @db @AppLockConfig tid
@@ -502,7 +503,6 @@ getAllFeatureConfigsTeam tid =
     <*> getConfigForTeam @db @GuestLinksConfig tid
     <*> getConfigForTeam @db @SndFactorPasswordChallengeConfig tid
     <*> getConfigForTeam @db @MLSConfig tid
-    <*> getConfigForTeam @db @SearchVisibilityInboundConfig tid
 
 -- | Note: this is an internal function which doesn't cover all features, e.g. LegalholdConfig
 genericGetConfigForTeam ::