diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 2dd8e510..32e1a914 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -21,6 +21,7 @@ import EntityPage from "./pages/ontologies/entities/EntityPage";
 import { getEntity } from "./pages/ontologies/ontologiesSlice";
 import Search from "./pages/search/Search";
 import {Helmet} from "react-helmet";
+import LoadingOverlay from "./components/LoadingOverlay";
 
 class App extends React.Component {
   render() {
@@ -100,6 +101,17 @@ export default App;
 function RedirectToClasses() {
   const params = useParams();
   const [search] = useSearchParams();
+  const entityIri = search.get("iri")
+  if(entityIri) {
+    return (
+      <Navigate
+        to={{
+          pathname: `/ontologies/${params.ontologyId}/entities/${encodeURIComponent(encodeURIComponent(entityIri))}`,
+          search: search.toString(),
+        }}
+      />
+    );
+  }
   return (
     <Navigate
       to={{
@@ -138,14 +150,14 @@ function RedirectToType() {
         to={{
           pathname: `/ontologies/${
             params.ontologyId
-          }/${entity.getTypePlural()}/${encodeURIComponent(
+          }/${entity.getTypePlural()}/${
             encodeURIComponent(params.entityIri as string)
-          )}`,
+          }`,
           search: search.toString(),
         }}
       />
     );
   } else {
-    return <Home />;
+    return <LoadingOverlay />
   }
 }
diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx
index d2b83b59..643a5315 100644
--- a/frontend/src/components/Header.tsx
+++ b/frontend/src/components/Header.tsx
@@ -16,7 +16,7 @@ export default function Header({ section }: { section?: string }) {
     >
         <Helmet>
           <meta charSet="utf-8" />
-          <title>{caps(section)} - Ontology Lookup Service</title>
+          <title>{caps(section || 'Not Found')} - Ontology Lookup Service</title>
         </Helmet>
       <div className="container mx-auto px-4 flex flex-col md:flex-row md:gap-10">
         <div className="py-6 self-center">