@@ -365,23 +365,26 @@ def get_aliases(self, identifier: str) -> tuple[str, ...]:
             The aliases.
         """
         if "(" in identifier:
-            identifier, parameter = identifier.split("(", 1)
+            identifier, _, parameter = identifier.partition("(")
             parameter = parameter.removesuffix(")")
         else:
             parameter = ""
         try:
             data = self._modules_collection[identifier]
         except (KeyError, AliasResolutionError):
             return ()
-        aliases = [data.path]
+        aliases: dict[str, object] = {data.path: None}
         try:
-            for alias in [data.canonical_path, *data.aliases]:
-                if alias not in aliases:
-                    aliases.append(alias)
+            canonical_path = data.canonical_path
+            data_aliases = data.aliases
         except AliasResolutionError:
             pass
+        else:
+            aliases[canonical_path] = None
+            aliases.update(data_aliases)
         if parameter:
-            return tuple(f"{alias}({parameter})" for alias in aliases)
+            suffix = f"({parameter})"
+            return tuple(alias + suffix for alias in aliases)
         return tuple(aliases)
 
     def normalize_extension_paths(self, extensions: Sequence) -> list[str | dict[str, Any]]:
 
@@ -125,6 +125,15 @@ def __call__(self, crossref: str, *, length: int) -> str:
 do_stash_crossref = _StashCrossRefFilter()
 """Filter to stash cross-references (and restore them after formatting and highlighting)."""
 
+_highlighting_span_re = re.compile(r'<span class="[a-z]{1,2}">')
+_crossref_key_re = re.compile(r"\b_[A-Za-z0-9]{2,}\b")
+
+
+def _restore_crossrefs(text: str, stash: dict[str, str]) -> str:
+    text = _crossref_key_re.sub(lambda match: stash.get(match[0], match[0]), text)
+    stash.clear()
+    return text
+
 
 def _format_signature(name: Markup, signature: str, line_length: int) -> str:
     name = str(name).strip()  # type: ignore[assignment]
@@ -199,13 +208,11 @@ def do_format_signature(
     # Pygments will set an `fm` (function -> magic) CSS class.
     # To fix this, we replace the CSS class in the first span with `nf`,
     # unless we already found an `nf` span.
-    if not re.search(r'<span class="nf">', signature):
-        signature = re.sub(r'<span class="[a-z]{1,2}">', '<span class="nf">', signature, count=1)
+    if '<span class="nf">' not in signature:
+        signature = _highlighting_span_re.sub('<span class="nf">', signature, count=1)
 
     if stash := env.filters["stash_crossref"].stash:
-        for key, value in stash.items():
-            signature = re.sub(rf"\b{key}\b", value, signature)
-        stash.clear()
+        signature = _restore_crossrefs(signature, stash)
 
     return signature
 
@@ -267,9 +274,7 @@ def do_format_attribute(
     )
 
     if stash := env.filters["stash_crossref"].stash:
-        for key, value in stash.items():
-            signature = re.sub(rf"\b{key}\b", value, signature)
-        stash.clear()
+        signature = _restore_crossrefs(signature, stash)
 
     return signature
 
@@ -322,13 +327,11 @@ def do_format_type_alias(
     # but instead as a regular name: `n` CSS class instead of `nc`.
     # To fix it, we replace the first occurrence of an `n` CSS class
     # with an `nc` one, unless we found `nc` already.
-    if not re.search(r'<span class="nc">', signature):
-        signature = re.sub(r'<span class="[a-z]{1,2}">', '<span class="nc">', signature, count=1)
+    if '<span class="nc">' not in signature:
+        signature = _highlighting_span_re.sub('<span class="nc">', signature, count=1)
 
     if stash := env.filters["stash_crossref"].stash:
-        for key, value in stash.items():
-            signature = re.sub(rf"\b{key}\b", value, signature)
-        stash.clear()
+        signature = _restore_crossrefs(signature, stash)
 
     return signature
 
 
@@ -15,6 +15,7 @@
 import mkdocstrings
 import pytest
 from griffe import (
+    Alias,
     Docstring,
     DocstringSectionExamples,
     DocstringSectionKind,
@@ -52,6 +53,32 @@ def test_collect_with_null_parser(handler: PythonHandler) -> None:
     assert handler.collect("mkdocstrings", PythonOptions(docstring_style=None))
 
 
+def test_get_aliases(handler: PythonHandler) -> None:
+    """Assert aliases are unique, ordered, and extended with parameter identifiers."""
+    with temporary_visited_module(
+        "def target(parameter): ...",
+        module_name="package",
+        modules_collection=handler._modules_collection,
+    ) as module:
+        target = module["target"]
+        module["alias"] = Alias("alias", target=target)
+        module["other_alias"] = Alias("other_alias", target=target)
+        module["unresolved"] = Alias("unresolved", target="missing.target")
+
+        assert handler.get_aliases("package.target") == (
+            "package.target",
+            "package.alias",
+            "package.other_alias",
+        )
+        assert handler.get_aliases("package.alias(parameter)") == (
+            "package.alias(parameter)",
+            "package.target(parameter)",
+            "package.other_alias(parameter)",
+        )
+        assert handler.get_aliases("package.unresolved") == ("package.unresolved",)
+        assert handler.get_aliases("package.missing") == ()
+
+
 @pytest.mark.parametrize(
     "handler",
     [
 
@@ -56,6 +56,16 @@ def test_format_signature(name: Markup, signature: str) -> None:
         assert rendering._format_signature(name, signature, length)
 
 
+def test_restore_crossrefs() -> None:
+    """Restore multiple stashed cross-references without replacing partial keys."""
+    stash = {"_short": "<autoref>short</autoref>", "_shorter": "<autoref>shorter</autoref>"}
+
+    restored = rendering._restore_crossrefs("_short + _shorter + x_short + _shorterx", stash)
+
+    assert restored == "<autoref>short</autoref> + <autoref>shorter</autoref> + x_short + _shorterx"
+    assert not stash
+
+
 @dataclass
 class _FakeObject:
     name: str