diff --git a/src/lib/table/Table.svelte b/src/lib/table/Table.svelte
index f32f823f..d58b7860 100644
--- a/src/lib/table/Table.svelte
+++ b/src/lib/table/Table.svelte
@@ -1,12 +1,15 @@
-
+ {#if filter}
+
+
+
+ {#if header}
+ {@render header()}
+ {/if}
+
+ {:else if header}
+ {@render header()}
+ {/if}
+ {#if footer}
+ {@render footer()}
+ {/if}
diff --git a/src/lib/table/TableBody.svelte b/src/lib/table/TableBody.svelte
index 823e9d8d..d22b4d53 100644
--- a/src/lib/table/TableBody.svelte
+++ b/src/lib/table/TableBody.svelte
@@ -1,18 +1,33 @@
-
{#if children}
{@render children()}
{/if}
+ {#if row && filtered}
+ {#each filtered as item, index}
+ {@render row({item, index})}
+ {/each}
+ {/if}
diff --git a/src/lib/table/TableBodyCell.svelte b/src/lib/table/TableBodyCell.svelte
index afbe2049..3e35ed24 100644
--- a/src/lib/table/TableBodyCell.svelte
+++ b/src/lib/table/TableBodyCell.svelte
@@ -1,4 +1,4 @@
-
-
+{#if sort}
+ |
+
+ |
+{:else}
+
{#if children}
{@render children()}
{/if}
|
+{/if}
diff --git a/src/lib/table/TableSearch.svelte b/src/lib/table/TableSearch.svelte
index 1a8fffe3..f1b24504 100644
--- a/src/lib/table/TableSearch.svelte
+++ b/src/lib/table/TableSearch.svelte
@@ -1,13 +1,19 @@
-