diff --git a/web/src/lib/components/base/multi_select.svelte b/web/src/lib/components/base/multi_select.svelte
index 2adffb93..19ab5e69 100644
--- a/web/src/lib/components/base/multi_select.svelte
+++ b/web/src/lib/components/base/multi_select.svelte
@@ -39,7 +39,7 @@
         </label>
     {/if}
     <button
-        class="min-w-44 flex flex-wrap items-center gap-2 border border-input-border bg-input-background min-h-[50px] p-3 rounded-md transition-colors focus:border-input-border-focus focus:outline-none focus:ring-0"
+        class="min-w-44 w-full flex flex-wrap items-center gap-2 border border-input-border bg-input-background min-h-[50px] p-3 rounded-md transition-colors focus:border-input-border-focus focus:outline-none focus:ring-0"
         on:click={() => (showDropdown = !showDropdown)}
     >
         {#if value.length === 0}
diff --git a/web/src/lib/components/base/search.svelte b/web/src/lib/components/base/search.svelte
index 279261ee..70aa02af 100644
--- a/web/src/lib/components/base/search.svelte
+++ b/web/src/lib/components/base/search.svelte
@@ -18,6 +18,8 @@
     export let placeholder: string = "Search...";
     export let large: boolean = false;
     export let extraClasses: string = "";
+    export let label: string = "";
+    export let clearAfterSelect: boolean = true;
 
     const dispatch = createEventDispatcher();
 
@@ -46,23 +48,32 @@
     function handleItemClick(item: SearchItem) {
         searching = false;
         dispatch("click", item);
-        clear();
+        if (clearAfterSelect) {
+            clear();
+        }
     }
 
     function clear() {
         value = "";
+        items = [];
         update(value);
     }
 </script>
 
 <div class="relative {extraClasses}">
-    <span class="absolute top-1/2 -translate-y-1/2 left-0 pl-4">
+    <span
+        class="absolute {large
+            ? 'bottom-[31px]'
+            : 'bottom-[25px]'} translate-y-1/2 left-0 pl-4"
+    >
         <i class="fa fa-search" class:text-xl={large}></i>
     </span>
     {#if value.length > 0}
         <button
             type="button"
-            class="btn-icon absolute top-1/2 -translate-y-1/2 right-0 mr-2"
+            class="btn-icon absolute {large
+                ? 'bottom-[31px]'
+                : 'bottom-[25px]'} translate-y-1/2 right-0 mr-2"
             on:click={clear}
             in:fade={{ duration: 150 }}
             out:fade={{ duration: 150 }}
@@ -74,6 +85,7 @@
         type="search"
         name="q"
         autocomplete="off"
+        {label}
         extraClasses={large
             ? "px-12 py-4 text-xl min-w-80 w-[33vw] max-w-[532px] rounded-xl"
             : "px-10"}
diff --git a/web/src/lib/components/list/list_share_modal.svelte b/web/src/lib/components/list/list_share_modal.svelte
index 490010be..69a41b98 100644
--- a/web/src/lib/components/list/list_share_modal.svelte
+++ b/web/src/lib/components/list/list_share_modal.svelte
@@ -5,11 +5,11 @@
     import { TrailShare } from "$lib/models/trail_share";
     import type { User } from "$lib/models/user";
     import {
-    list_share_create,
+        list_share_create,
         list_share_delete,
         list_share_index,
         list_share_update,
-        shares
+        shares,
     } from "$lib/stores/list_share_store";
     import { lists } from "$lib/stores/list_store";
     import { show_toast } from "$lib/stores/toast_store";
@@ -26,6 +26,7 @@
     import Search, { type SearchItem } from "../base/search.svelte";
     import type { SelectItem } from "../base/select.svelte";
     import Select from "../base/select.svelte";
+    import UserSearch from "../user_search.svelte";
 
     let openModal: (() => void) | undefined = undefined;
     export let closeModal: (() => void) | undefined = undefined;
@@ -43,8 +44,6 @@
 
     let copyButtonText = $_("copy-link");
 
-    let searchItems: SearchItem[] = [];
-
     let sharesLoading: boolean = false;
 
     const permissionSelectItems: SelectItem[] = [
@@ -52,33 +51,16 @@
         { text: $_("edit"), value: "edit" },
     ];
 
-    async function updateUsers(q: string) {
-        try {
-            const users: User[] = await users_search(q);
-            searchItems = users.map((u) => ({
-                text: u.username!,
-                value: u,
-                icon: "user",
-            }));
-        } catch (e) {
-            console.error(e);
-            show_toast({
-                type: "error",
-                icon: "close",
-                text: "Error during search",
-            });
-        }
-    }
-
     function copyURLToClipboard() {
-        navigator.clipboard.writeText(window.location.href.split('?')[0] + '?list=' + list.id);
+        navigator.clipboard.writeText(
+            window.location.href.split("?")[0] + "?list=" + list.id,
+        );
 
         copyButtonText = $_("link-copied");
         setTimeout(() => (copyButtonText = $_("copy-link")), 3000);
     }
 
     function close() {
-        searchItems = [];
         dispatch("save");
         closeModal!();
     }
@@ -134,7 +116,7 @@
             trails: list.expand?.trails ?? [],
             list_share_via_list: fetchedShares,
         };
-        lists.set($lists)
+        lists.set($lists);
         sharesLoading = false;
     }
 </script>
@@ -150,21 +132,7 @@
         <p class="p-4 bg-amber-100 rounded-xl mb-4 text-sm text-gray-500">
             {$_("list-share-warning")}
         </p>
-        <Search
-            on:update={(e) => updateUsers(e.detail)}
-            on:click={(e) => shareList(e.detail)}
-            placeholder={`${$_("username")}`}
-            items={searchItems}
-        >
-            <img
-                slot="item-header"
-                let:item
-                class="rounded-full w-8 aspect-square mr-2"
-                src={getFileURL(item.value, item.value.avatar) ||
-                    `https://api.dicebear.com/7.x/initials/svg?seed=${item.value.username}&backgroundType=gradientLinear`}
-                alt="avatar"
-            />
-        </Search>
+        <UserSearch includeSelf={false} on:click={(e) => shareList(e.detail)}></UserSearch>
         <h4 class="font-semibold mt-4">{$_("shared-with")}</h4>
 
         {#if $shares.length == 0}
diff --git a/web/src/lib/components/trail/trail_card.svelte b/web/src/lib/components/trail/trail_card.svelte
index 51bdd0bc..ec34c6b4 100644
--- a/web/src/lib/components/trail/trail_card.svelte
+++ b/web/src/lib/components/trail/trail_card.svelte
@@ -8,6 +8,7 @@
     } from "$lib/util/format_util";
     import { _ } from "svelte-i18n";
     import ShareInfo from "../share_info.svelte";
+    import { pb } from "$lib/pocketbase";
 
     export let trail: Trail;
 
@@ -27,15 +28,15 @@
     <div
         class="relative w-full min-h-40 max-h-48 overflow-hidden rounded-t-2xl"
     >
-        <img src={thumbnail} alt="" />
+        <img id="header-img" src={thumbnail} alt="" />
     </div>
-    {#if trail.public || trailIsShared}
+    {#if (trail.public || trailIsShared) && pb.authStore.model}
         <div
             class="flex absolute top-4 right-4 {trail.public && trailIsShared
                 ? 'w-14'
                 : 'w-8'} h-8 rounded-full items-center justify-center bg-background text-content"
         >
-            {#if trail.public}
+            {#if trail.public && pb.authStore.model}
                 <span
                     class="tooltip"
                     class:mr-2={trail.public && trailIsShared}
@@ -62,6 +63,20 @@
                     })}
                 </p>
             {/if}
+            {#if trail.expand.author}
+                <p class="text-xs text-gray-500 mb-3">
+                    {$_("by")} <img
+                        class="rounded-full w-5 aspect-square mx-1 inline"
+                        src={getFileURL(
+                            trail.expand.author,
+                            trail.expand.author.avatar,
+                        ) ||
+                            `https://api.dicebear.com/7.x/initials/svg?seed=${trail.expand.author.username}&backgroundType=gradientLinear`}
+                        alt="avatar"
+                    />
+                    {trail.expand.author.username}
+                </p>
+            {/if}
             <div class="flex gap-x-4">
                 {#if trail.location}
                     <h5>
@@ -75,7 +90,9 @@
                 </h5>
             </div>
         </div>
-        <div class="grid grid-cols-2 mt-2 gap-1 text-sm text-gray-500 whitespace-nowrap">
+        <div
+            class="grid grid-cols-2 mt-2 gap-1 text-sm text-gray-500 whitespace-nowrap"
+        >
             <span
                 ><i class="fa fa-left-right mr-2"></i>{formatDistance(
                     trail.distance,
@@ -101,12 +118,12 @@
 </div>
 
 <style>
-    .trail-card img {
+    .trail-card #header-img {
         object-fit: cover;
         transition: 0.25s ease;
     }
 
-    .trail-card:hover img {
+    .trail-card:hover #header-img {
         scale: 1.075;
     }
 </style>
diff --git a/web/src/lib/components/trail/trail_filter_panel.svelte b/web/src/lib/components/trail/trail_filter_panel.svelte
index 4084b603..661b1c95 100644
--- a/web/src/lib/components/trail/trail_filter_panel.svelte
+++ b/web/src/lib/components/trail/trail_filter_panel.svelte
@@ -6,13 +6,16 @@
     import { createEventDispatcher } from "svelte";
     import { _ } from "svelte-i18n";
     import { slide } from "svelte/transition";
+    import Datepicker from "../base/datepicker.svelte";
     import DoubleSlider from "../base/double_slider.svelte";
+    import MultiSelect from "../base/multi_select.svelte";
     import type { RadioItem } from "../base/radio_group.svelte";
     import RadioGroup from "../base/radio_group.svelte";
     import Search, { type SearchItem } from "../base/search.svelte";
     import type { SelectItem } from "../base/select.svelte";
     import Slider from "../base/slider.svelte";
-    import Datepicker from "../base/datepicker.svelte";
+    import UserSearch from "../user_search.svelte";
+    import { pb } from "$lib/pocketbase";
 
     export let categories: Category[];
     export let filterExpanded: boolean = true;
@@ -20,6 +23,11 @@
     export let showTrailSearch: boolean = true;
     export let showCitySearch: boolean = true;
 
+    $: categorySelectItems = categories.map((c) => ({
+        value: c.id,
+        text: c.name,
+    }));
+
     const dispatch = createEventDispatcher();
 
     const radioGroupItems: RadioItem[] = [
@@ -42,31 +50,29 @@
         dispatch("update", filter);
     }
 
-    function setCategoryFilter(category: Category) {
-        const categoryIndex = filter.category.findIndex(
-            (c) => c == category.id,
-        );
-        if (categoryIndex !== -1) {
-            filter.category.splice(categoryIndex, 1);
-        } else {
-            filter.category.push(category.id);
-        }
+    function setCategoryFilter(categories: SelectItem[]) {
+        filter.category = categories.map((c) => c.value);
 
         update();
     }
 
-    function setDifficultyFilter(
-        difficulty: "easy" | "moderate" | "difficult",
-    ) {
-        const difficultyIndex = filter.difficulty.findIndex(
-            (d) => d == difficulty,
-        );
-        if (difficultyIndex !== -1) {
-            filter.difficulty.splice(difficultyIndex, 1);
-        } else {
-            filter.difficulty.push(difficulty);
-        }
+    function setAuthorFilter(item: SearchItem) {
+        filter.author = item.value.id;
+        update();
+    }
 
+    function setDifficultyFilter(difficulties: SelectItem[]) {
+        filter.difficulty = difficulties.map((d) => d.value);
+        update();
+    }
+
+    function setPublicFilter(e: Event) {
+        filter.public = (e.target as HTMLInputElement).checked;
+        update();
+    }
+
+    function setSharedFilter(e: Event) {
+        filter.shared = (e.target as HTMLInputElement).checked;
         update();
     }
 
@@ -145,47 +151,63 @@
             {#if showTrailSearch}
                 <hr class="my-4 border-separator" />
             {/if}
-            <p class="text-sm font-medium pb-4">{$_("category")}</p>
-            {#each categories as category, i}
-                <div class="flex items-center mb-4">
-                    <input
-                        id="{category.name}-checkbox"
-                        type="checkbox"
-                        checked={filter.category.includes(category.id)}
-                        value={category.id}
-                        class="w-4 h-4 bg-input-background accent-primary border-input-border focus:ring-input-ring focus:ring-2"
-                        on:change={() => setCategoryFilter(category)}
-                    />
-                    <label for="{category.name}-checkbox" class="ms-2 text-sm"
-                        >{$_(category.name)}</label
-                    >
-                </div>
-            {/each}
+            <MultiSelect
+                on:change={(e) => setCategoryFilter(e.detail)}
+                label={$_("categories")}
+                items={categorySelectItems}
+                placeholder={`${$_("filter-categories")}...`}
+            ></MultiSelect>
             <hr class="my-4 border-separator" />
-            <p class="text-sm font-medium pb-4">{$_("difficulty")}</p>
-            {#each difficultyItems as difficulty, i}
-                <div class="flex items-center mb-4">
+            {#if pb.authStore.model}
+                <UserSearch
+                    on:click={(e) => setAuthorFilter(e.detail)}
+                    on:clear={() => {
+                        filter.author = "";
+                        update();
+                    }}
+                    clearAfterSelect={false}
+                    label={$_("author")}
+                ></UserSearch>
+                <div class="flex items-center my-4">
                     <input
-                        id="{difficulty.value}-checkbox"
+                        id="public-checkbox"
                         type="checkbox"
-                        checked={filter.difficulty.includes(difficulty.value)}
-                        value={difficulty.value}
+                        checked={filter.public}
                         class="w-4 h-4 bg-input-background accent-primary border-input-border focus:ring-input-ring focus:ring-2"
-                        on:change={() => setDifficultyFilter(difficulty.value)}
+                        on:change={setPublicFilter}
                     />
-                    <label
-                        for="{difficulty.value}-checkbox"
-                        class="ms-2 text-sm">{difficulty.text}</label
+                    <label for="public-checkbox" class="ms-2 text-sm"
+                        >{$_("public")}</label
                     >
                 </div>
-            {/each}
+                <div class="flex items-center my-4">
+                    <input
+                        id="shared-checkbox"
+                        type="checkbox"
+                        checked={filter.shared}
+                        class="w-4 h-4 bg-input-background accent-primary border-input-border focus:ring-input-ring focus:ring-2"
+                        on:change={setSharedFilter}
+                    />
+                    <label for="shared-checkbox" class="ms-2 text-sm"
+                        >{$_("shared")}</label
+                    >
+                </div>
+                <hr class="my-4 border-separator" />
+            {/if}
+            <MultiSelect
+                on:change={(e) => setDifficultyFilter(e.detail)}
+                label={$_("difficulty")}
+                items={difficultyItems}
+                placeholder={`${$_("filter-difficulty")}...`}
+            ></MultiSelect>
             <hr class="my-4 border-separator" />
             {#if showCitySearch}
-                <p class="text-sm font-medium pb-4">{$_("near")}</p>
                 <div class="mb-8">
                     <Search
                         items={searchDropdownItems}
+                        label={$_("near")}
                         placeholder="{$_('search-cities')}..."
+                        clearAfterSelect={false}
                         bind:value={citySearchQuery}
                         on:update={(e) => searchCities(e.detail)}
                         on:click={(e) => handleSearchClick(e.detail)}
diff --git a/web/src/lib/components/trail/trail_info_panel.svelte b/web/src/lib/components/trail/trail_info_panel.svelte
index 97560e3b..c58943f8 100644
--- a/web/src/lib/components/trail/trail_info_panel.svelte
+++ b/web/src/lib/components/trail/trail_info_panel.svelte
@@ -38,6 +38,7 @@
     import PhotoGallery from "../photo_gallery.svelte";
     import ShareInfo from "../share_info.svelte";
     import SummitLogTable from "../summit_log/summit_log_table.svelte";
+    import { pb } from "$lib/pocketbase";
 
     export let trail: Trail;
     export let mode: "overview" | "map" | "list" = "map";
@@ -184,14 +185,14 @@
             <div
                 class="absolute bottom-0 w-full h-1/2 bg-gradient-to-b from-transparent to-black opacity-50"
             ></div>
-            {#if trail.public || trailIsShared}
+            {#if (trail.public || trailIsShared) && pb.authStore.model}
                 <div
                     class="flex absolute top-8 right-6 {trail.public &&
                     trailIsShared
                         ? 'w-16'
                         : 'w-8'} h-8 rounded-full items-center justify-center bg-white text-primary"
                 >
-                    {#if trail.public}
+                    {#if trail.public && pb.authStore.model}
                         <span
                             class="tooltip text-2xl"
                             class:mr-3={trail.public && trailIsShared}
@@ -226,6 +227,21 @@
                             )}
                         </h5>
                     {/if}
+                    {#if trail.expand.author}
+                        <p class="my-3">
+                            {$_("by")}
+                            <img
+                                class="rounded-full w-8 aspect-square mx-1 inline"
+                                src={getFileURL(
+                                    trail.expand.author,
+                                    trail.expand.author.avatar,
+                                ) ||
+                                    `https://api.dicebear.com/7.x/initials/svg?seed=${trail.expand.author.username}&backgroundType=gradientLinear`}
+                                alt="avatar"
+                            />
+                            {trail.expand.author.username}
+                        </p>
+                    {/if}
                     <div class="flex flex-wrap gap-x-8 gap-y-2 mt-4 mr-8">
                         {#if trail.location}
                             <h3 class="text-lg">
diff --git a/web/src/lib/components/trail/trail_list_item.svelte b/web/src/lib/components/trail/trail_list_item.svelte
index eeb1fe7c..3a8e3679 100644
--- a/web/src/lib/components/trail/trail_list_item.svelte
+++ b/web/src/lib/components/trail/trail_list_item.svelte
@@ -8,6 +8,7 @@
     } from "$lib/util/format_util";
     import { _ } from "svelte-i18n";
     import ShareInfo from "../share_info.svelte";
+    import { pb } from "$lib/pocketbase";
 
     export let trail: Trail;
 
@@ -29,7 +30,7 @@
             <h4 class="font-semibold text-lg">
                 {trail.name}
             </h4>
-            {#if trail.public}
+            {#if trail.public && pb.authStore.model}
                 <span class="tooltip ml-3" data-title={$_("public")}>
                     <i class="fa fa-globe"></i>
                 </span>
@@ -48,6 +49,21 @@
                 })}
             </p>
         {/if}
+        {#if trail.expand.author}
+            <p class="text-xs text-gray-500 mb-3">
+                {$_("by")}
+                <img
+                    class="rounded-full w-5 aspect-square mx-1 inline"
+                    src={getFileURL(
+                        trail.expand.author,
+                        trail.expand.author.avatar,
+                    ) ||
+                        `https://api.dicebear.com/7.x/initials/svg?seed=${trail.expand.author.username}&backgroundType=gradientLinear`}
+                    alt="avatar"
+                />
+                {trail.expand.author.username}
+            </p>
+        {/if}
         <div class="flex flex-wrap gap-x-8">
             {#if trail.location}
                 <h5><i class="fa fa-location-dot mr-3"></i>{trail.location}</h5>
diff --git a/web/src/lib/components/trail/trail_share_modal.svelte b/web/src/lib/components/trail/trail_share_modal.svelte
index 31a205b6..ffc55ad7 100644
--- a/web/src/lib/components/trail/trail_share_modal.svelte
+++ b/web/src/lib/components/trail/trail_share_modal.svelte
@@ -19,6 +19,7 @@
     import Search, { type SearchItem } from "../base/search.svelte";
     import type { SelectItem } from "../base/select.svelte";
     import Select from "../base/select.svelte";
+    import UserSearch from "../user_search.svelte";
 
     let openModal: (() => void) | undefined = undefined;
     export let closeModal: (() => void) | undefined = undefined;
@@ -35,8 +36,6 @@
 
     let copyButtonText = $_("copy-link");
 
-    let searchItems: SearchItem[] = [];
-
     let sharesLoading: boolean = false;
 
     const permissionSelectItems: SelectItem[] = [
@@ -44,24 +43,6 @@
         { text: $_("edit"), value: "edit" },
     ];
 
-    async function updateUsers(q: string) {
-        try {
-            const users: User[] = await users_search(q);
-            searchItems = users.map((u) => ({
-                text: u.username!,
-                value: u,
-                icon: "user",
-            }));
-        } catch (e) {
-            console.error(e);
-            show_toast({
-                type: "error",
-                icon: "close",
-                text: "Error during search",
-            });
-        }
-    }
-
     function copyURLToClipboard() {
         navigator.clipboard.writeText(window.location.href);
 
@@ -70,7 +51,6 @@
     }
 
     function close() {
-        searchItems = [];
         dispatch("save");
         closeModal!();
     }
@@ -81,7 +61,10 @@
         fetchShares();
     }
 
-    async function updateSharePermission(share:TrailShare, permission: "view"| "edit" ) {
+    async function updateSharePermission(
+        share: TrailShare,
+        permission: "view" | "edit",
+    ) {
         share.permission = permission;
         await trail_share_update(share);
     }
@@ -93,39 +76,26 @@
 
     async function fetchShares() {
         sharesLoading = true;
-        await trail_share_index({trail: trail.id!});
+        await trail_share_index({ trail: trail.id! });
         sharesLoading = false;
     }
 </script>
 
 <Modal
     id="share-modal"
-    title={$_('share-this-trail')}
+    title={$_("share-this-trail")}
     size="max-w-sm overflow-visible"
     bind:openModal
     bind:closeModal
 >
     <div slot="content">
-        <Search
-            on:update={(e) => updateUsers(e.detail)}
-            on:click={(e) => shareTrail(e.detail)}
-            placeholder={`${$_("username")}`}
-            items={searchItems}
-        >
-            <img
-                slot="item-header"
-                let:item
-                class="rounded-full w-8 aspect-square mr-2"
-                src={getFileURL(item.value, item.value.avatar) ||
-                    `https://api.dicebear.com/7.x/initials/svg?seed=${item.value.username}&backgroundType=gradientLinear`}
-                alt="avatar"
-            />
-        </Search>
-        <h4 class="font-semibold mt-4">{$_('shared-with')}</h4>
+        <UserSearch includeSelf={false} on:click={(e) => shareTrail(e.detail)}
+        ></UserSearch>
+        <h4 class="font-semibold mt-4">{$_("shared-with")}</h4>
 
         {#if $shares.length == 0}
             <p class="text-gray-500 text-center mt-2 text-sm">
-                {$_('trail-not-shared')}
+                {$_("trail-not-shared")}
             </p>
         {:else}
             {#each $shares as share}
@@ -141,17 +111,22 @@
                             alt="avatar"
                         />
                         <p>{share.expand.user.username}</p>
-                        <span class="basis-full text-sm text-center text-gray-500">{$_('can')}</span>
+                        <span
+                            class="basis-full text-sm text-center text-gray-500"
+                            >{$_("can")}</span
+                        >
                         <div class="shrink-0">
                             <Select
                                 bind:value={share.permission}
                                 items={permissionSelectItems}
-                                on:change={(e) => updateSharePermission(share, e.detail)}
+                                on:change={(e) =>
+                                    updateSharePermission(share, e.detail)}
                             ></Select>
                         </div>
 
-                        <button class="btn-icon text-red-500"
-                        on:click={() => deleteShare(share)}
+                        <button
+                            class="btn-icon text-red-500"
+                            on:click={() => deleteShare(share)}
                             ><i class="fa fa-trash"></i></button
                         >
                     </div>
diff --git a/web/src/lib/components/user_search.svelte b/web/src/lib/components/user_search.svelte
new file mode 100644
index 00000000..2e052073
--- /dev/null
+++ b/web/src/lib/components/user_search.svelte
@@ -0,0 +1,67 @@
+<script lang="ts">
+    import type { User } from "$lib/models/user";
+    import { show_toast } from "$lib/stores/toast_store";
+    import { users_search } from "$lib/stores/user_store";
+    import { getFileURL } from "$lib/util/file_util";
+    import { createEventDispatcher, tick } from "svelte";
+    import Search, { type SearchItem } from "./base/search.svelte";
+    import { _ } from "svelte-i18n";
+
+    export let label: string = "";
+    export let value: string = "";
+    export let includeSelf: boolean = true;
+    export let clearAfterSelect: boolean = true;
+
+    let searchItems: SearchItem[] = [];
+
+    const dispatch = createEventDispatcher();
+
+    async function updateUsers(q: string) {
+        if (!q.length) {
+            searchItems = [];
+            dispatch("clear");
+            return;
+        }
+        try {
+            const users: User[] = await users_search(q, includeSelf);
+            searchItems = users.map((u) => ({
+                text: u.username!,
+                value: u,
+                icon: "user",
+            }));
+        } catch (e) {
+            console.error(e);
+            show_toast({
+                type: "error",
+                icon: "close",
+                text: "Error during search",
+            });
+        }
+    }
+
+    function onClick(e: CustomEvent<SearchItem>) {
+        value = e.detail.value.username ?? value;
+
+        dispatch("click", e.detail);
+        searchItems = [];
+    }
+</script>
+
+<Search
+    on:update={(e) => updateUsers(e.detail)}
+    on:click={(e) => onClick(e)}
+    placeholder={`${$_("username")}...`}
+    items={searchItems}
+    {clearAfterSelect}
+    {label}
+    bind:value
+>
+    <img
+        slot="item-header"
+        let:item
+        class="rounded-full w-8 aspect-square mr-2"
+        src={getFileURL(item.value, item.value.avatar) ||
+            `https://api.dicebear.com/7.x/initials/svg?seed=${item.value.username}&backgroundType=gradientLinear`}
+        alt="avatar"
+    />
+</Search>
diff --git a/web/src/lib/i18n/locales/de.json b/web/src/lib/i18n/locales/de.json
index 88eebc09..36c22729 100644
--- a/web/src/lib/i18n/locales/de.json
+++ b/web/src/lib/i18n/locales/de.json
@@ -18,10 +18,12 @@
   "already-account": "Du hast bereits ein Konto?",
   "altitude": "Höhe",
   "api-documentation": "API Dokumentation",
+  "author": "",
   "avatar": "Avatar",
   "average-speed": "Durchschn. Geschwindigkeit",
   "basic-info": "Basisinformation",
   "before": "Vor",
+  "by": "",
   "can": "kann",
   "cancel": "Abbrechen",
   "card": "{n, plural, =1 {Karte} other {Karten}}",
@@ -93,6 +95,7 @@
   "file-format": "Dateiformat",
   "file-too-big": "",
   "filter-categories": "Kategorien filtern",
+  "filter-difficulty": "",
   "focus-map-on": "Karte fokussieren auf",
   "french": "Französisch",
   "german": "Deutsch",
@@ -182,6 +185,7 @@
   "share": "Teilen",
   "share-this-list": "Diese Liste teilen",
   "share-this-trail": "Diese Route teilen",
+  "shared": "",
   "shared-by": "Geteilt von",
   "shared-with": "Geteilt mit",
   "show-in-overview": "In der Übersicht anzeigen",
diff --git a/web/src/lib/i18n/locales/en.json b/web/src/lib/i18n/locales/en.json
index bc8e28d1..260a040a 100644
--- a/web/src/lib/i18n/locales/en.json
+++ b/web/src/lib/i18n/locales/en.json
@@ -18,10 +18,12 @@
   "already-account": "Already have an account?",
   "altitude": "Altitude",
   "api-documentation": "API Documentation",
+  "author": "Author",
   "avatar": "Avatar",
   "average-speed": "Avg. Speed",
   "basic-info": "Basic Info",
   "before": "Before",
+  "by": "by",
   "can": "can",
   "cancel": "Cancel",
   "card": "{n, plural, =1 {Card} other {Cards}}",
@@ -93,6 +95,7 @@
   "file-format": "File format",
   "file-too-big": "File {file} is too big (max. {size})",
   "filter-categories": "Filter categories",
+  "filter-difficulty": "Filter difficulty",
   "focus-map-on": "Focus map on",
   "french": "French",
   "german": "German",
@@ -182,6 +185,7 @@
   "share": "Share",
   "share-this-list": "Share this list",
   "share-this-trail": "Share this trail",
+  "shared": "Shared",
   "shared-by": "Shared by",
   "shared-with": "Shared with",
   "show-in-overview": "Show in overview",
diff --git a/web/src/lib/i18n/locales/fr.json b/web/src/lib/i18n/locales/fr.json
index 70653fa0..cc7733cb 100644
--- a/web/src/lib/i18n/locales/fr.json
+++ b/web/src/lib/i18n/locales/fr.json
@@ -18,10 +18,12 @@
   "already-account": "Déjà un compte ?",
   "altitude": "Altitude",
   "api-documentation": "Documentation API",
+  "author": "",
   "avatar": "Avatar",
   "average-speed": "",
   "basic-info": "Informations de base",
   "before": "",
+  "by": "",
   "can": "",
   "cancel": "Annuler",
   "card": "{n, plural, =1 {Carte} other {Cartes}}",
@@ -93,6 +95,7 @@
   "file-format": "",
   "file-too-big": "",
   "filter-categories": "",
+  "filter-difficulty": "",
   "focus-map-on": "",
   "french": "Français",
   "german": "Allemand",
@@ -182,6 +185,7 @@
   "share": "",
   "share-this-list": "",
   "share-this-trail": "",
+  "shared": "",
   "shared-by": "",
   "shared-with": "",
   "show-in-overview": "Voir dans l'aperçu",
diff --git a/web/src/lib/i18n/locales/hu.json b/web/src/lib/i18n/locales/hu.json
index c4a038b9..9ee0898a 100644
--- a/web/src/lib/i18n/locales/hu.json
+++ b/web/src/lib/i18n/locales/hu.json
@@ -18,10 +18,12 @@
   "already-account": "Már rendelkezik fiókkal?",
   "altitude": "Magasság",
   "api-documentation": "API Dokumentáció",
+  "author": "",
   "avatar": "Avatar",
   "average-speed": "",
   "basic-info": "Alap információk",
   "before": "",
+  "by": "",
   "can": "",
   "cancel": "Mégsem",
   "card": "{n, plural, =1 {Kártya} other {Kártyák}}",
@@ -93,6 +95,7 @@
   "file-format": "",
   "file-too-big": "",
   "filter-categories": "",
+  "filter-difficulty": "",
   "focus-map-on": "",
   "french": "Francia",
   "german": "Német",
@@ -182,6 +185,7 @@
   "share": "",
   "share-this-list": "",
   "share-this-trail": "",
+  "shared": "",
   "shared-by": "",
   "shared-with": "",
   "show-in-overview": "Áttekintés",
diff --git a/web/src/lib/i18n/locales/it.json b/web/src/lib/i18n/locales/it.json
index 7e036762..543bcbfe 100644
--- a/web/src/lib/i18n/locales/it.json
+++ b/web/src/lib/i18n/locales/it.json
@@ -18,10 +18,12 @@
   "already-account": "Hai già un account?",
   "altitude": "Altitudine",
   "api-documentation": "Documentazione API",
+  "author": "",
   "avatar": "Avatar",
   "average-speed": "",
   "basic-info": "Informazioni di base",
   "before": "",
+  "by": "",
   "can": "può",
   "cancel": "Annulla",
   "card": "{n, plural, =1 {Carta} other {Carte}}",
@@ -93,6 +95,7 @@
   "file-format": "Formato del file",
   "file-too-big": "",
   "filter-categories": "",
+  "filter-difficulty": "",
   "focus-map-on": "",
   "french": "Francese",
   "german": "Tedesco",
@@ -182,6 +185,7 @@
   "share": "Condividi",
   "share-this-list": "",
   "share-this-trail": "Condividi questo percorso",
+  "shared": "",
   "shared-by": "Condiviso da",
   "shared-with": "Condiviso con",
   "show-in-overview": "Mostra nella panoramica",
diff --git a/web/src/lib/i18n/locales/nl.json b/web/src/lib/i18n/locales/nl.json
index 8fd4288f..97768296 100644
--- a/web/src/lib/i18n/locales/nl.json
+++ b/web/src/lib/i18n/locales/nl.json
@@ -18,10 +18,12 @@
   "already-account": "Heb je al een account?",
   "altitude": "Hoogte",
   "api-documentation": "API-documentatie",
+  "author": "",
   "avatar": "Profielfoto",
   "average-speed": "",
   "basic-info": "Algemene informatie",
   "before": "",
+  "by": "",
   "can": "",
   "cancel": "Annuleren",
   "card": "{n, plural, =1 {kaart} other {kaarten}}",
@@ -93,6 +95,7 @@
   "file-format": "",
   "file-too-big": "",
   "filter-categories": "",
+  "filter-difficulty": "",
   "focus-map-on": "",
   "french": "Frans",
   "german": "Duits",
@@ -182,6 +185,7 @@
   "share": "",
   "share-this-list": "",
   "share-this-trail": "",
+  "shared": "",
   "shared-by": "",
   "shared-with": "",
   "show-in-overview": "Tonen op overzicht",
diff --git a/web/src/lib/i18n/locales/pl.json b/web/src/lib/i18n/locales/pl.json
index 12e468f4..ca032509 100644
--- a/web/src/lib/i18n/locales/pl.json
+++ b/web/src/lib/i18n/locales/pl.json
@@ -18,10 +18,12 @@
   "already-account": "Czy masz już konto?",
   "altitude": "Wysokość",
   "api-documentation": "Dokumentacja API",
+  "author": "",
   "avatar": "Awatar",
   "average-speed": "",
   "basic-info": "Podstawowe informacje",
   "before": "",
+  "by": "",
   "can": "",
   "cancel": "Anuluj",
   "card": "{n, plural, =1 {Karta} other {Karty}}",
@@ -93,6 +95,7 @@
   "file-format": "",
   "file-too-big": "",
   "filter-categories": "",
+  "filter-difficulty": "",
   "focus-map-on": "",
   "french": "Francuski",
   "german": "Niemiecki",
@@ -182,6 +185,7 @@
   "share": "",
   "share-this-list": "",
   "share-this-trail": "",
+  "shared": "",
   "shared-by": "",
   "shared-with": "",
   "show-in-overview": "Pokaż w przeglądzie",
diff --git a/web/src/lib/i18n/locales/pt.json b/web/src/lib/i18n/locales/pt.json
index e91e2dcb..7edd13ea 100644
--- a/web/src/lib/i18n/locales/pt.json
+++ b/web/src/lib/i18n/locales/pt.json
@@ -18,10 +18,12 @@
   "already-account": "Já tem uma conta?",
   "altitude": "Altitude",
   "api-documentation": "Documentação da API",
+  "author": "",
   "avatar": "Avatar",
   "average-speed": "",
   "basic-info": "Informações básicas",
   "before": "",
+  "by": "",
   "can": "",
   "cancel": "Cancelar",
   "card": "{n, plural, =1 {Cartão} other {cartãos}}",
@@ -93,6 +95,7 @@
   "file-format": "",
   "file-too-big": "",
   "filter-categories": "",
+  "filter-difficulty": "",
   "focus-map-on": "",
   "french": "Francês",
   "german": "Alemão",
@@ -182,6 +185,7 @@
   "share": "",
   "share-this-list": "",
   "share-this-trail": "",
+  "shared": "",
   "shared-by": "",
   "shared-with": "",
   "show-in-overview": "Mostrar na vista geral",
diff --git a/web/src/lib/i18n/locales/zh.json b/web/src/lib/i18n/locales/zh.json
index 70f4cc4b..fbe7eb3a 100644
--- a/web/src/lib/i18n/locales/zh.json
+++ b/web/src/lib/i18n/locales/zh.json
@@ -18,10 +18,12 @@
   "already-account": "已注册账户？",
   "altitude": "海拔",
   "api-documentation": "API 文档",
+  "author": "",
   "avatar": "头像",
   "average-speed": "",
   "basic-info": "基本信息",
   "before": "",
+  "by": "",
   "can": "",
   "cancel": "取消",
   "card": "{n, plural, =1 {卡片} other {卡片}}",
@@ -93,6 +95,7 @@
   "file-format": "",
   "file-too-big": "",
   "filter-categories": "",
+  "filter-difficulty": "",
   "focus-map-on": "",
   "french": "法语",
   "german": "德语",
@@ -182,6 +185,7 @@
   "share": "",
   "share-this-list": "",
   "share-this-trail": "",
+  "shared": "",
   "shared-by": "",
   "shared-with": "",
   "show-in-overview": "详情中展示",
diff --git a/web/src/lib/models/trail.ts b/web/src/lib/models/trail.ts
index f735bd1f..e11fdccf 100644
--- a/web/src/lib/models/trail.ts
+++ b/web/src/lib/models/trail.ts
@@ -2,6 +2,7 @@ import type { Category } from "./category";
 import type { Comment } from "./comment";
 import type { SummitLog } from "./summit_log";
 import type { TrailShare } from "./trail_share";
+import type { UserAnonymous } from "./user";
 import type { Waypoint } from "./waypoint";
 
 class Trail {
@@ -28,6 +29,7 @@ class Trail {
         category?: Category;
         waypoints: Waypoint[]
         summit_logs: SummitLog[]
+        author?: UserAnonymous
         comments_via_trail: Comment[]
         gpx_data?: string
         trail_share_via_trail?: TrailShare[]
@@ -97,6 +99,9 @@ interface TrailFilter {
     q: string,
     category: string[],
     difficulty: ("easy" | "moderate" | "difficult")[]
+    author?: string;
+    public?: boolean;
+    shared?: boolean;
     near: {
         lat?: number,
         lon?: number,
@@ -138,4 +143,4 @@ interface TrailBoundingBox {
 
 export { Trail };
 
-export type { TrailFilter, TrailFilterValues, TrailBoundingBox };
\ No newline at end of file
+    export type { TrailBoundingBox, TrailFilter, TrailFilterValues };
diff --git a/web/src/lib/models/user.ts b/web/src/lib/models/user.ts
index 383a4c08..4759f081 100644
--- a/web/src/lib/models/user.ts
+++ b/web/src/lib/models/user.ts
@@ -8,4 +8,10 @@ export type User = {
     avatar?: string;
     language?: string;
     created?: string;
+}
+
+export type UserAnonymous = {
+    id: string,
+    username?: string,
+    avatar?: string;
 }
\ No newline at end of file
diff --git a/web/src/lib/stores/trail_store.ts b/web/src/lib/stores/trail_store.ts
index c2f235bc..da516a41 100644
--- a/web/src/lib/stores/trail_store.ts
+++ b/web/src/lib/stores/trail_store.ts
@@ -401,7 +401,35 @@ function buildFilterText(filter: TrailFilter, includeGeo: boolean): string {
         filterText += ` AND elevation_loss <= ${Math.ceil(filter.elevationLossMax)}`
     }
 
-    filterText += ` AND difficulty IN [${filter.difficulty.join(",")}]`
+    if (filter.difficulty.length > 0) {
+        filterText += ` AND difficulty IN [${filter.difficulty.join(",")}]`
+    }
+
+    if (filter.author?.length) {
+        filterText += ` AND author = ${filter.author}`
+    }
+
+    if (filter.public !== undefined || filter.shared !== undefined) {
+        filterText += " AND ("
+        if (filter.public !== undefined) {
+            filterText += `(public = ${filter.public}`
+
+            if (!filter.author?.length || filter.author == pb.authStore.model?.id) {
+                filterText += ` OR author = ${pb.authStore.model?.id}`
+            }
+            filterText += ")"
+        }
+
+        if (filter.shared !== undefined) {
+            if (filter.shared === true) {
+                filterText += ` OR shares = ${pb.authStore.model?.id}`
+            } else {
+                filterText += ` AND NOT shares = ${pb.authStore.model?.id}`
+
+            }
+        }
+        filterText += ")"
+    }
 
     if (filter.startDate) {
         filterText += ` AND date >= ${new Date(filter.startDate).getTime() / 1000}`
diff --git a/web/src/lib/stores/user_store.ts b/web/src/lib/stores/user_store.ts
index aeee51b9..7bc9dbe9 100644
--- a/web/src/lib/stores/user_store.ts
+++ b/web/src/lib/stores/user_store.ts
@@ -20,9 +20,9 @@ export async function users_create(user: User) {
     return createdUser;
 }
 
-export async function users_search(q: string) {
+export async function users_search(q: string, includeSelf: boolean = true) {
     let r = await fetch('/api/v1/user/anonymous?' + new URLSearchParams({
-        "filter": `username~"${q}"&&id!="${pb.authStore.model?.id}"`,
+        "filter": `username~"${q}"${includeSelf ? '' : '&&id!="${pb.authStore.model?.id}"'}`,
     }), {
         method: 'GET',
     })
diff --git a/web/src/routes/api/v1/trail/+server.ts b/web/src/routes/api/v1/trail/+server.ts
index 01564ee1..3e6d1ce7 100644
--- a/web/src/routes/api/v1/trail/+server.ts
+++ b/web/src/routes/api/v1/trail/+server.ts
@@ -21,8 +21,18 @@ export async function GET(event: RequestEvent) {
                 .getList<Trail>(parseInt(page), parseInt(perPage), { expand: expand ?? "", sort: sort ?? "", filter: filter ?? "" })
         }
 
+        for (const t of r.items) {
+            if (!t.author || !pb.authStore.model) {
+                continue;
+            }
+            if(!t.expand) {
+                t.expand = {} as any
+            }
+            t.expand.author = await pb.collection("users_anonymous").getOne(t.author);
+        }
         return json(r)
     } catch (e: any) {
+        console.error(e)
         throw error(e.status, e);
     }
 }
diff --git a/web/src/routes/api/v1/trail/[id]/+server.ts b/web/src/routes/api/v1/trail/[id]/+server.ts
index f79d4bbc..66b5d86c 100644
--- a/web/src/routes/api/v1/trail/[id]/+server.ts
+++ b/web/src/routes/api/v1/trail/[id]/+server.ts
@@ -9,14 +9,22 @@ export async function GET(event: RequestEvent) {
         const r = await pb.collection('trails')
             .getOne<Trail>(event.params.id as string, { expand: expand ?? "" })
 
+
+        if (pb.authStore.model) {
+            if (!r.expand) {
+                r.expand = {} as any
+            }
+            r.expand.author = await pb.collection("users_anonymous").getOne(r.author!);
+        }
+
         // remove time from dates
         r.date = r.date?.substring(0, 10) ?? ""
         for (const log of r.expand?.summit_logs ?? []) {
             log.date = log.date.substring(0, 10)
         }
         return json(r)
-    } catch (e: any) {       
-        throw error(e.status || 500, e);
+    } catch (e: any) {
+        throw error(e.status || 500, e);
     }
 }
 
diff --git a/web/src/routes/map/+page.ts b/web/src/routes/map/+page.ts
index 324d8ef1..5228f819 100644
--- a/web/src/routes/map/+page.ts
+++ b/web/src/routes/map/+page.ts
@@ -11,6 +11,9 @@ export const load: ServerLoad = async ({ params, locals, fetch }) => {
         q: "",
         category: [],
         difficulty: ["easy", "moderate", "difficult"],
+        author: "",
+        public: true,
+        shared: true,
         near: {
             radius: 2000,
         },
diff --git a/web/src/routes/trails/+page.server.ts b/web/src/routes/trails/+page.server.ts
index 23b3d81b..33030b6c 100644
--- a/web/src/routes/trails/+page.server.ts
+++ b/web/src/routes/trails/+page.server.ts
@@ -10,6 +10,9 @@ export const load: ServerLoad = async ({ params, locals, url, fetch }) => {
         q: "",
         category: [],
         difficulty: ["easy", "moderate", "difficult"],
+        author: "",
+        public: true,
+        shared: true,
         near: {
             radius: 2000,
         },
diff --git a/web/static/models/mountain.glb b/web/static/models/mountain.glb
new file mode 100644
index 00000000..adda48a6
Binary files /dev/null and b/web/static/models/mountain.glb differ