diff --git a/.idea/.idea.HopFrame/.idea/workspace.xml b/.idea/.idea.HopFrame/.idea/workspace.xml
index 9dc017e..e3831a5 100644
--- a/.idea/.idea.HopFrame/.idea/workspace.xml
+++ b/.idea/.idea.HopFrame/.idea/workspace.xml
@@ -12,8 +12,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="0648788e-7696-4e60-bf12-5d5601f33d8c" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/src/HopFrame.Core/Config/TableConfig.cs" beforeDir="false" afterPath="$PROJECT_DIR$/src/HopFrame.Core/Config/TableConfig.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/HopFrame.Core/Services/Implementations/ContextExplorer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/src/HopFrame.Core/Services/Implementations/ContextExplorer.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/HopFrame.Web/Components/Pages/HopFrameTablePage.razor" beforeDir="false" afterPath="$PROJECT_DIR$/src/HopFrame.Web/Components/Pages/HopFrameTablePage.razor" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/testing/HopFrame.Testing/Program.cs" beforeDir="false" afterPath="$PROJECT_DIR$/testing/HopFrame.Testing/Program.cs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -280,15 +280,7 @@
       <workItem from="1768753475773" duration="455000" />
       <workItem from="1768753946559" duration="690000" />
       <workItem from="1768756619311" duration="94000" />
-      <workItem from="1768847832546" duration="354000" />
-    </task>
-    <task id="LOCAL-00018" summary="Added more tests">
-      <option name="closed" value="true" />
-      <created>1737285123218</created>
-      <option name="number" value="00018" />
-      <option name="presentableId" value="LOCAL-00018" />
-      <option name="project" value="LOCAL" />
-      <updated>1737285123218</updated>
+      <workItem from="1768847832546" duration="758000" />
     </task>
     <task id="LOCAL-00019" summary="Added web module tests">
       <option name="closed" value="true" />
@@ -674,7 +666,15 @@
       <option name="project" value="LOCAL" />
       <updated>1768847968844</updated>
     </task>
-    <option name="localTasksCounter" value="67" />
+    <task id="LOCAL-00067" summary="Fixed #37">
+      <option name="closed" value="true" />
+      <created>1768848267710</created>
+      <option name="number" value="00067" />
+      <option name="presentableId" value="LOCAL-00067" />
+      <option name="project" value="LOCAL" />
+      <updated>1768848267710</updated>
+    </task>
+    <option name="localTasksCounter" value="68" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -715,7 +715,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
-    <MESSAGE value="Added fully virtual properties" />
     <MESSAGE value="Added basic export and import feature" />
     <MESSAGE value="Finished converter plugin" />
     <MESSAGE value="Patched CI" />
@@ -740,6 +739,7 @@
     <MESSAGE value="fixed echo cmd" />
     <MESSAGE value="Code cleanup + new pipeline setup" />
     <MESSAGE value="Fixed #38" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fixed #38" />
+    <MESSAGE value="Fixed #37" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fixed #37" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/HopFrame.Core/Services/Implementations/ContextExplorer.cs b/src/HopFrame.Core/Services/Implementations/ContextExplorer.cs
index a088d0f..83b4eff 100644
--- a/src/HopFrame.Core/Services/Implementations/ContextExplorer.cs
+++ b/src/HopFrame.Core/Services/Implementations/ContextExplorer.cs
@@ -33,7 +33,6 @@ internal sealed class ContextExplorer(HopFrameConfig config, IServiceProvider pr
     public TableConfig? GetTable(Type tableEntity) {
         foreach (var context in config.Contexts) {
             var table = context.Tables
-                .Where(t => !t.Ignored)
                 .FirstOrDefault(table => table.TableType == tableEntity);
             if (table is null) continue;
             
diff --git a/src/HopFrame.Web/Components/Dialogs/HopFrameRelationPicker.razor b/src/HopFrame.Web/Components/Dialogs/HopFrameRelationPicker.razor
index d201ccd..b62d997 100644
--- a/src/HopFrame.Web/Components/Dialogs/HopFrameRelationPicker.razor
+++ b/src/HopFrame.Web/Components/Dialogs/HopFrameRelationPicker.razor
@@ -9,6 +9,7 @@
         DisplayActions="false"
         DisplaySelection="true"
         TableDisplayName="@Content.SourceTable.DisplayName"
+        TableType="@Content.SourceTable.TableType"
         PerPage="15"
         DialogData="Content"
         SelectionMode="@(Content.AllowMultiple ? DataGridSelectMode.Multiple : DataGridSelectMode.Single)"/>
diff --git a/src/HopFrame.Web/Components/Pages/HopFrameTablePage.razor b/src/HopFrame.Web/Components/Pages/HopFrameTablePage.razor
index c57cf28..e80bb4b 100644
--- a/src/HopFrame.Web/Components/Pages/HopFrameTablePage.razor
+++ b/src/HopFrame.Web/Components/Pages/HopFrameTablePage.razor
@@ -186,9 +186,12 @@
 @inject ISearchSuggestionProvider SearchSuggestions
 
 @code {
+
+    [Parameter]
+    public string TableDisplayName { get; set; } = null!;
     
     [Parameter]
-    public required string TableDisplayName { get; set; }
+    public Type? TableType { get; set; }
     
     [Parameter]
     public bool DisplaySelection { get; set; }
@@ -229,6 +232,11 @@
 
     protected override void OnInitialized() {
         CurrentInstance = this;
+
+        if (TableType is not null) {
+            _config ??= Explorer.GetTable(TableType);
+        }
+        
         _config ??= Explorer.GetTable(TableDisplayName);
 
         if (_config is null || (_config.Ignored && DialogData is null)) {