diff --git a/pwa/src/apiService/apiService.ts b/pwa/src/apiService/apiService.ts
index b035aab1..3dde8d6b 100644
--- a/pwa/src/apiService/apiService.ts
+++ b/pwa/src/apiService/apiService.ts
@@ -32,6 +32,7 @@ import Upload from "./resources/upload";
 interface PromiseMessage {
   loading?: string;
   success?: string;
+  error?: string;
 }
 
 export type TSendFunction = (
@@ -255,37 +256,35 @@ export default class APIService {
     switch (action) {
       case "GET":
         const response = instance.get(endpoint);
-
-        response.catch((err) => toast.error(err.message));
-
+        response.catch((err) => toast.error(promiseMessage?.error ?? err.message));
         return response;
 
       case "POST":
         return toast.promise(instance.post(endpoint, _payload), {
           loading: promiseMessage?.loading ?? "Creating item...",
           success: promiseMessage?.success ?? "Succesfully created item",
-          error: (err) => err.message,
+          error: (err) => promiseMessage?.error ?? err.message,
         });
 
       case "PUT":
         return toast.promise(instance.put(endpoint, _payload), {
           loading: promiseMessage?.loading ?? "Updating item...",
           success: promiseMessage?.success ?? "Succesfully updated item",
-          error: (err) => err.message,
+          error: (err) => promiseMessage?.error ?? err.message,
         });
 
       case "DELETE":
         return toast.promise(instance.delete(endpoint), {
           loading: promiseMessage?.loading ?? "Deleting item...",
           success: promiseMessage?.success ?? "Succesfully deleted item",
-          error: (err) => err.message,
+          error: (err) => promiseMessage?.error ?? err.message,
         });
 
       case "DOWNLOAD":
         return toast.promise(instance.get(endpoint), {
           loading: promiseMessage?.loading ?? "Downloading item...",
           success: promiseMessage?.success ?? "Succesfully downloaded item",
-          error: (err) => err.message,
+          error: (err) => promiseMessage?.error ?? err.message,
         });
     }
   };
diff --git a/pwa/src/apiService/resources/dashboardCards.tsx b/pwa/src/apiService/resources/dashboardCards.tsx
index 7e3b866a..b9d4975e 100644
--- a/pwa/src/apiService/resources/dashboardCards.tsx
+++ b/pwa/src/apiService/resources/dashboardCards.tsx
@@ -25,7 +25,9 @@ export default class DashboardCards {
   }
 
   public getAll = async (): Promise<any> => {
-    const { data } = await this._send(this._instance, "GET", "/admin/dashboardCards");
+    const { data } = await this._send(this._instance, "GET", "/admin/dashboardCards", undefined, {
+      error: "Could not fetch Dashboardcards.",
+    });
 
     return data;
   };
diff --git a/pwa/src/apiService/resources/source.ts b/pwa/src/apiService/resources/source.ts
index dfdaadb0..82877ff0 100644
--- a/pwa/src/apiService/resources/source.ts
+++ b/pwa/src/apiService/resources/source.ts
@@ -16,6 +16,12 @@ export default class Source {
     return data;
   };
 
+  public getAllSelectOptions = async (): Promise<any> => {
+    const { data } = await this._send(this._instance, "GET", "/admin/gateways?limit=200");
+
+    return data?.map((source: any) => ({ label: source.name, value: source.id }));
+  };
+
   public getOne = async (id: string): Promise<any> => {
     const { data } = await this._send(this._instance, "GET", `/admin/gateways/${id}`);
 
diff --git a/pwa/src/context/logs.ts b/pwa/src/context/logs.ts
index 74125129..f3f234b1 100644
--- a/pwa/src/context/logs.ts
+++ b/pwa/src/context/logs.ts
@@ -13,6 +13,7 @@ export interface ILogFiltersContext {
     process?: string;
     endpoint?: string;
     schema?: string;
+    source?: string;
     cronjob?: string;
     action?: string;
     user?: string;
diff --git a/pwa/src/context/tableColumns.ts b/pwa/src/context/tableColumns.ts
index 3d5361b7..e55b307a 100644
--- a/pwa/src/context/tableColumns.ts
+++ b/pwa/src/context/tableColumns.ts
@@ -21,6 +21,7 @@ const logColumns = {
   created: true,
   endpoint: true,
   schema: true,
+  source: true,
   cronjob: true,
   action: true,
   user: true,
diff --git a/pwa/src/hooks/dashboardCards.ts b/pwa/src/hooks/dashboardCards.ts
index 20f79d0e..9b321a5f 100644
--- a/pwa/src/hooks/dashboardCards.ts
+++ b/pwa/src/hooks/dashboardCards.ts
@@ -13,6 +13,7 @@ export const useDashboardCards = (queryClient: QueryClient) => {
       onError: (error) => {
         console.warn(error.message);
       },
+      retry: 0,
     });
 
   const getOne = (dashboardCardsId: string) =>
diff --git a/pwa/src/hooks/source.ts b/pwa/src/hooks/source.ts
index f809615c..b0dfff2d 100644
--- a/pwa/src/hooks/source.ts
+++ b/pwa/src/hooks/source.ts
@@ -18,6 +18,13 @@ export const useSource = (queryClient: QueryClient) => {
       },
     });
 
+  const getAllSelectOptions = () =>
+    useQuery<any[], Error>("source_select_options", API.Sources.getAllSelectOptions, {
+      onError: (error) => {
+        console.warn(error.message);
+      },
+    });
+
   const getOne = (sourceId: string) =>
     useQuery<any, Error>(["sources", sourceId], () => API?.Sources.getOne(sourceId), {
       initialData: () => queryClient.getQueryData<any[]>("sources")?.find((_sources) => _sources.id === sourceId),
@@ -78,5 +85,5 @@ export const useSource = (queryClient: QueryClient) => {
       },
     });
 
-  return { getAll, getOne, remove, createOrEdit, getProxy };
+  return { getAll, getOne, remove, createOrEdit, getProxy, getAllSelectOptions };
 };
diff --git a/pwa/src/templates/gatewayDetailTemplate/GatewayDetailTemplate.tsx b/pwa/src/templates/gatewayDetailTemplate/GatewayDetailTemplate.tsx
index 88b79bde..43c6f468 100644
--- a/pwa/src/templates/gatewayDetailTemplate/GatewayDetailTemplate.tsx
+++ b/pwa/src/templates/gatewayDetailTemplate/GatewayDetailTemplate.tsx
@@ -70,7 +70,9 @@ export const GatewayDetailTemplate: React.FC = () => {
                     getPlugins.data.update ? getPlugins.data?.version : `Latest (${getPlugins.data?.version})`
                   } `}</p>
                 )}
-                <p>{`last update time: ${new Date(getPlugins.data?.time).toLocaleString()}`}</p>
+                <p>{`last update time: ${new Date(
+                  getPlugins.data?.versions[getPlugins.data?.version].time,
+                ).toLocaleString()}`}</p>
               </div>
 
               <div>
diff --git a/pwa/src/templates/logsDetailTemplate/LogsDetailTemplate.tsx b/pwa/src/templates/logsDetailTemplate/LogsDetailTemplate.tsx
index 14feb4fb..2d7e6267 100644
--- a/pwa/src/templates/logsDetailTemplate/LogsDetailTemplate.tsx
+++ b/pwa/src/templates/logsDetailTemplate/LogsDetailTemplate.tsx
@@ -23,6 +23,8 @@ import { Button } from "../../components/button/Button";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useMapping } from "../../hooks/mapping";
 import { useObject } from "../../hooks/object";
+import { CodeEditor } from "../../components/codeEditor/CodeEditor";
+import { useSource } from "../../hooks/source";
 
 interface LogsDetailTemplateProps {
   logId: string;
@@ -31,6 +33,10 @@ interface LogsDetailTemplateProps {
 export const LogsDetailTemplate: React.FC<LogsDetailTemplateProps> = ({ logId }) => {
   const { t } = useTranslation();
   const { setLogFilters } = useLogFiltersContext();
+  const [bodyData, setBodyData] = React.useState<any>("");
+  const [exceptionData, setExceptionData] = React.useState<any>("");
+  const [routeParametersData, setRouteParametersData] = React.useState<any>("");
+  const [sourceCallData, setSourceCallData] = React.useState<any>("");
 
   const queryClient = useQueryClient();
 
@@ -44,6 +50,7 @@ export const LogsDetailTemplate: React.FC<LogsDetailTemplateProps> = ({ logId })
   const getOrganization = useOrganization(queryClient).getOne(getLog.data?.context?.organization);
   const getMapping = useMapping(queryClient).getOne(getLog.data?.context?.mapping);
   const getObject = useObject().getOne(getLog.data?.context?.object);
+  const getSource = useSource(queryClient).getOne(getLog.data?.context?.source);
 
   const handleSetContextFilter = (
     context:
@@ -51,6 +58,7 @@ export const LogsDetailTemplate: React.FC<LogsDetailTemplateProps> = ({ logId })
       | "process"
       | "endpoint"
       | "schema"
+      | "source"
       | "cronjob"
       | "action"
       | "user"
@@ -70,6 +78,13 @@ export const LogsDetailTemplate: React.FC<LogsDetailTemplateProps> = ({ logId })
     navigate("/logs");
   };
 
+  React.useEffect(() => {
+    setBodyData(JSON.stringify(getLog.data?.context?.body, null, 2));
+    setExceptionData(JSON.stringify(getLog.data?.context?.exception, null, 2));
+    setRouteParametersData(JSON.stringify(getLog.data?.context?.route_parameters, null, 2));
+    setSourceCallData(JSON.stringify(getLog.data?.context?.sourceCall, null, 2));
+  }, [getLog]);
+
   return (
     <Container layoutClassName={styles.container}>
       <Heading1>{t("Logs detail page")}</Heading1>
@@ -99,22 +114,120 @@ export const LogsDetailTemplate: React.FC<LogsDetailTemplateProps> = ({ logId })
                 </TableRow>
               </TableHead>
               <TableBody>
-                <TableRow>
-                  <TableHeader>Host</TableHeader>
-                  <TableCell>{getLog.data.context?.host !== "" ? getLog.data.context?.host : "-"}</TableCell>
-                  <TableCell>-</TableCell>
-                  <TableCell>-</TableCell>
-                </TableRow>
-                <TableRow>
-                  <TableHeader>IP</TableHeader>
-                  <TableCell>{getLog.data.context?.ip !== "" ? getLog.data.context?.ip : "-"}</TableCell>
-                  <TableCell>-</TableCell>
-                  <TableCell>-</TableCell>
-                </TableRow>
+                {getLog.data.context?.exception && (
+                  <TableRow>
+                    <TableHeader>Exception</TableHeader>
+                    <TableCell colSpan={3}>
+                      <CodeEditor language="json" code={exceptionData} setCode={setExceptionData} readOnly />
+                    </TableCell>
+                  </TableRow>
+                )}
+                {getLog.data.context?.method && (
+                  <TableRow>
+                    <TableHeader>Method</TableHeader>
+                    <TableCell>{getLog.data.context?.method !== "" ? getLog.data.context?.method : "-"}</TableCell>
+                    <TableCell>-</TableCell>
+                    <TableCell>-</TableCell>
+                  </TableRow>
+                )}
+                {getLog.data.context?.querystring && (
+                  <TableRow>
+                    <TableHeader>Querystring</TableHeader>
+                    <TableCell>
+                      {getLog.data.context?.querystring !== "" ? getLog.data.context?.querystring : "-"}
+                    </TableCell>
+                    <TableCell>-</TableCell>
+                    <TableCell>-</TableCell>
+                  </TableRow>
+                )}
+                {getLog.data.context?.pathRaw && (
+                  <TableRow>
+                    <TableHeader>pathRaw</TableHeader>
+                    <TableCell>{getLog.data.context?.pathRaw !== "" ? getLog.data.context?.pathRaw : "-"}</TableCell>
+                    <TableCell>-</TableCell>
+                    <TableCell>-</TableCell>
+                  </TableRow>
+                )}
+                {getLog.data.context?.request_uri && (
+                  <TableRow>
+                    <TableHeader>Request URI</TableHeader>
+                    <TableCell>
+                      {getLog.data.context?.request_uri !== "" ? getLog.data.context?.request_uri : "-"}
+                    </TableCell>
+                    <TableCell>-</TableCell>
+                    <TableCell>-</TableCell>
+                  </TableRow>
+                )}
+                {getLog.data.context?.route && (
+                  <TableRow>
+                    <TableHeader>Route</TableHeader>
+                    <TableCell>{getLog.data.context?.route !== "" ? getLog.data.context?.route : "-"}</TableCell>
+                    <TableCell>-</TableCell>
+                    <TableCell>-</TableCell>
+                  </TableRow>
+                )}
+                {getLog.data.context?.route_parameters && (
+                  <TableRow>
+                    <TableHeader>Route Parameters</TableHeader>
+                    <TableCell colSpan={3}>
+                      <CodeEditor
+                        language="json"
+                        code={routeParametersData}
+                        setCode={setRouteParametersData}
+                        readOnly
+                      />
+                    </TableCell>
+                  </TableRow>
+                )}
+                {getLog.data.context?.contentType && (
+                  <TableRow>
+                    <TableHeader>Content Type</TableHeader>
+                    <TableCell>
+                      {getLog.data.context?.contentType !== "" ? getLog.data.context?.contentType : "-"}
+                    </TableCell>
+                    <TableCell>-</TableCell>
+                    <TableCell>-</TableCell>
+                  </TableRow>
+                )}
+                {getLog.data.context?.body && (
+                  <TableRow>
+                    <TableHeader>Body</TableHeader>
+                    <TableCell colSpan={3}>
+                      <CodeEditor language="json" code={bodyData} setCode={setBodyData} readOnly />
+                    </TableCell>
+                  </TableRow>
+                )}
+                {getLog.data.context?.crude_body && (
+                  <TableRow>
+                    <TableHeader>Crude Body</TableHeader>
+                    <TableCell colSpan={3}>{getLog.data.context?.crude_body}</TableCell>
+                  </TableRow>
+                )}
+                {getLog.data.context?.mongoDBFilter && (
+                  <TableRow>
+                    <TableHeader>MongoDB Filter</TableHeader>
+                    <TableCell colSpan={3}>{getLog.data.context?.mongoDBFilter}</TableCell>
+                  </TableRow>
+                )}
+                {getLog.data.context?.plugin && (
+                  <TableRow>
+                    <TableHeader>Plugin</TableHeader>
+                    <TableCell>{getLog.data.context?.plugin !== "" ? getLog.data.context?.plugin : "-"}</TableCell>
+                    <TableCell>-</TableCell>
+                    <TableCell>-</TableCell>
+                  </TableRow>
+                )}
+                {getLog.data.context?.sourceCall && (
+                  <TableRow>
+                    <TableHeader>Source Call</TableHeader>
+                    <TableCell colSpan={3}>
+                      <CodeEditor language="json" code={sourceCallData} setCode={setSourceCallData} readOnly />
+                    </TableCell>
+                  </TableRow>
+                )}
                 <TableRow>
                   <TableHeader>Session</TableHeader>
                   <TableCell>{getLog.data.context?.session !== "" ? getLog.data.context?.session : "-"}</TableCell>
-
                   <TableCell>
                     <Button
                       variant="primary"
@@ -130,7 +243,6 @@ export const LogsDetailTemplate: React.FC<LogsDetailTemplateProps> = ({ logId })
                 <TableRow>
                   <TableHeader>Process</TableHeader>
                   <TableCell>{getLog.data.context?.process !== "" ? getLog.data.context?.process : "-"}</TableCell>
-
                   <TableCell>
                     <Button
                       variant="primary"
@@ -192,8 +304,8 @@ export const LogsDetailTemplate: React.FC<LogsDetailTemplateProps> = ({ logId })
                       variant="primary"
                       label={t("Set filter")}
                       icon={faFilter}
-                      disabled={!getEndpoint.data?.id}
-                      onClick={() => handleSetContextFilter("schema", getEndpoint.data.id)}
+                      disabled={!getSchema.data?.id}
+                      onClick={() => handleSetContextFilter("schema", getSchema.data.id)}
                     />
                   </TableCell>
                   <TableCell>
@@ -206,6 +318,37 @@ export const LogsDetailTemplate: React.FC<LogsDetailTemplateProps> = ({ logId })
                     />
                   </TableCell>
                 </TableRow>
+                <TableRow>
+                  <TableHeader>Source</TableHeader>
+                  {getLog.data.context?.source ? (
+                    getSource.isSuccess && <TableCell>{getSource.data.name ?? getLog.data.context?.source}</TableCell>
+                  ) : (
+                    <TableCell>-</TableCell>
+                  )}
+                  {getSource.isLoading && (
+                    <TableCell>
+                      <Skeleton />
+                    </TableCell>
+                  )}
+                  <TableCell>
+                    <Button
+                      variant="primary"
+                      label={t("Set filter")}
+                      icon={faFilter}
+                      disabled={!getSource.data?.id}
+                      onClick={() => handleSetContextFilter("source", getSource.data.id)}
+                    />
+                  </TableCell>
+                  <TableCell>
+                    <Button
+                      variant="primary"
+                      label={t("Details")}
+                      icon={faArrowRight}
+                      disabled={!getLog.data.context?.source}
+                      onClick={() => navigate(`/sources/${getLog.data.context?.source}`)}
+                    />
+                  </TableCell>
+                </TableRow>
                 <TableRow>
                   <TableHeader>Cronjob</TableHeader>
                   {getLog.data.context?.cronjob ? (
@@ -404,9 +547,7 @@ export const LogsDetailTemplate: React.FC<LogsDetailTemplateProps> = ({ logId })
                 <TableRow>
                   <TableHeader>Object</TableHeader>
                   {getLog.data.context?.object ? (
-                    getObject.isSuccess && (
-                      <TableCell>{getObject.data.titel ?? getLog.data.context?.object}</TableCell>
-                    )
+                    getObject.isSuccess && <TableCell>{getObject.data.titel ?? getLog.data.context?.object}</TableCell>
                   ) : (
                     <TableCell>-</TableCell>
                   )}
@@ -434,6 +575,18 @@ export const LogsDetailTemplate: React.FC<LogsDetailTemplateProps> = ({ logId })
                     />
                   </TableCell>
                 </TableRow>
+                <TableRow>
+                  <TableHeader>Host</TableHeader>
+                  <TableCell>{getLog.data.context?.host !== "" ? getLog.data.context?.host : "-"}</TableCell>
+                  <TableCell>-</TableCell>
+                  <TableCell>-</TableCell>
+                </TableRow>
+                <TableRow>
+                  <TableHeader>IP</TableHeader>
+                  <TableCell>{getLog.data.context?.ip !== "" ? getLog.data.context?.ip : "-"}</TableCell>
+                  <TableCell>-</TableCell>
+                  <TableCell>-</TableCell>
+                </TableRow>
               </TableBody>
             </Table>
           </div>
diff --git a/pwa/src/templates/templateParts/actionsForm/ActionFormTemplate.tsx b/pwa/src/templates/templateParts/actionsForm/ActionFormTemplate.tsx
index 3fe5167e..af1d3315 100644
--- a/pwa/src/templates/templateParts/actionsForm/ActionFormTemplate.tsx
+++ b/pwa/src/templates/templateParts/actionsForm/ActionFormTemplate.tsx
@@ -275,46 +275,50 @@ export const ActionFormTemplate: React.FC<ActionFormTemplateProps> = ({ action }
                     </FormFieldInput>
                   </FormField>
                 </div>
-                <Divider />
-                <div className={styles.grid}>
-                  <FormField>
-                    <FormFieldInput>
-                      <FormFieldLabel>{t("Date Created")}</FormFieldLabel>
-                      <div>{translateDate(i18n.language, action.dateCreated) ?? "-"}</div>
-                    </FormFieldInput>
-                  </FormField>
-
-                  <FormField>
-                    <FormFieldInput>
-                      <FormFieldLabel>{t("Date Modified")}</FormFieldLabel>
-                      <div>{translateDate(i18n.language, action.dateModified) ?? "-"}</div>
-                    </FormFieldInput>
-                  </FormField>
-
-                  <FormField>
-                    <FormFieldInput>
-                      <FormFieldLabel>{t("Last run")}</FormFieldLabel>
-                      <div> {action.lastRun ? formatDateTime(t(i18n.language), action.lastRun) : "-"}</div>
-                    </FormFieldInput>
-                  </FormField>
-
-                  <FormField>
-                    <FormFieldInput>
-                      <FormFieldLabel>{t("Last run time")}</FormFieldLabel>
-                      <div>{`${action.lastRunTime}s` ?? "-"}</div>
-                    </FormFieldInput>
-                  </FormField>
-
-                  <FormField>
-                    <FormFieldInput>
-                      <FormFieldLabel>{t("Status")}</FormFieldLabel>
-                      <StatusTag
-                        type={action.status ? "success" : "default"}
-                        label={action.status ? "Success" : "No status"}
-                      />
-                    </FormFieldInput>
-                  </FormField>
-                </div>
+                {action && (
+                  <>
+                    <Divider />
+                    <div className={styles.grid}>
+                      <FormField>
+                        <FormFieldInput>
+                          <FormFieldLabel>{t("Date Created")}</FormFieldLabel>
+                          <div>{translateDate(i18n.language, action.dateCreated) ?? "-"}</div>
+                        </FormFieldInput>
+                      </FormField>
+
+                      <FormField>
+                        <FormFieldInput>
+                          <FormFieldLabel>{t("Date Modified")}</FormFieldLabel>
+                          <div>{translateDate(i18n.language, action.dateModified) ?? "-"}</div>
+                        </FormFieldInput>
+                      </FormField>
+
+                      <FormField>
+                        <FormFieldInput>
+                          <FormFieldLabel>{t("Last run")}</FormFieldLabel>
+                          <div> {action.lastRun ? formatDateTime(t(i18n.language), action.lastRun) : "-"}</div>
+                        </FormFieldInput>
+                      </FormField>
+
+                      <FormField>
+                        <FormFieldInput>
+                          <FormFieldLabel>{t("Last run time")}</FormFieldLabel>
+                          <div>{`${action.lastRunTime}s` ?? "-"}</div>
+                        </FormFieldInput>
+                      </FormField>
+
+                      <FormField>
+                        <FormFieldInput>
+                          <FormFieldLabel>{t("Status")}</FormFieldLabel>
+                          <StatusTag
+                            type={action.status ? "success" : "default"}
+                            label={action.status ? "Success" : "No status"}
+                          />
+                        </FormFieldInput>
+                      </FormField>
+                    </div>
+                  </>
+                )}
               </div>
             </TabPanel>
 
diff --git a/pwa/src/templates/templateParts/logFilters/LogFiltersTemplate.tsx b/pwa/src/templates/templateParts/logFilters/LogFiltersTemplate.tsx
index dcb4cdee..807dcb09 100644
--- a/pwa/src/templates/templateParts/logFilters/LogFiltersTemplate.tsx
+++ b/pwa/src/templates/templateParts/logFilters/LogFiltersTemplate.tsx
@@ -9,6 +9,7 @@ import { useUser } from "../../../hooks/user";
 import { useSchema } from "../../../hooks/schema";
 import { useAction } from "../../../hooks/action";
 import { useObject } from "../../../hooks/object";
+import { useSource } from "../../../hooks/source";
 import { useMapping } from "../../../hooks/mapping";
 import { useCronjob } from "../../../hooks/cronjob";
 import { useEndpoint } from "../../../hooks/endpoint";
@@ -33,6 +34,7 @@ export const LogFiltersTemplate: React.FC<LogFiltersTemplateProps> = ({ layoutCl
 
   const getEndpoints = useEndpoint(queryClient).getAllSelectOptions();
   const getSchemas = useSchema(queryClient).getAllSelectOptions();
+  const getSources = useSource(queryClient).getAllSelectOptions();
   const getCronjobs = useCronjob(queryClient).getAllSelectOptions();
   const getActions = useAction(queryClient).getAllSelectOptions();
   const getUsers = useUser(queryClient).getAllSelectOptions();
@@ -72,6 +74,7 @@ export const LogFiltersTemplate: React.FC<LogFiltersTemplateProps> = ({ layoutCl
         process: formValues.process,
         endpoint: formValues.endpoints?.value,
         schema: formValues.schemas?.value,
+        source: formValues.sources?.value,
         cronjob: formValues.cronjobs?.value,
         action: formValues.actions?.value,
         user: formValues.users?.value,
@@ -114,6 +117,11 @@ export const LogFiltersTemplate: React.FC<LogFiltersTemplateProps> = ({ layoutCl
       getSchemas.data?.find((schema) => schema.value === logFilters.context?.schema),
     );
 
+    setValue(
+      "sources",
+      getSources.data?.find((source) => source.value === logFilters.context?.source),
+    );
+
     setValue(
       "cronjobs",
       getCronjobs.data?.find((cronjob) => cronjob.value === logFilters.context?.cronjob),
@@ -229,6 +237,18 @@ export const LogFiltersTemplate: React.FC<LogFiltersTemplateProps> = ({ layoutCl
           </FormFieldInput>
         </FormField>
 
+        <FormField>
+          <FormFieldInput>
+            <FormFieldLabel>Sources</FormFieldLabel>
+
+            {getSources.isSuccess && (
+              <SelectSingle isClearable name="sources" {...{ register, errors, control }} options={getSources.data} />
+            )}
+
+            {getSources.isLoading && <Skeleton height="50px" />}
+          </FormFieldInput>
+        </FormField>
+
         <FormField>
           <FormFieldInput>
             <FormFieldLabel>Cronjobs</FormFieldLabel>
@@ -322,7 +342,6 @@ export const LogFiltersTemplate: React.FC<LogFiltersTemplateProps> = ({ layoutCl
             {getMappings.isLoading && <Skeleton height="50px" />}
           </FormFieldInput>
         </FormField>
-        <br />
 
         <FormField>
           <FormFieldInput>
diff --git a/pwa/src/templates/templateParts/logsTable/LogsTableTemplate.tsx b/pwa/src/templates/templateParts/logsTable/LogsTableTemplate.tsx
index 7164f965..5beb5569 100644
--- a/pwa/src/templates/templateParts/logsTable/LogsTableTemplate.tsx
+++ b/pwa/src/templates/templateParts/logsTable/LogsTableTemplate.tsx
@@ -78,6 +78,7 @@ export const LogsTableTemplate: React.FC<LogsTableTemplateProps> = ({ logs, pagi
               {logColumns.created && <TableHeader>{t("Created")}</TableHeader>}
               {logColumns.endpoint && <TableHeader>{t("Endpoint")}</TableHeader>}
               {logColumns.schema && <TableHeader>{t("Schema")}</TableHeader>}
+              {logColumns.source && <TableHeader>{t("Source")}</TableHeader>}
               {logColumns.cronjob && <TableHeader>{t("Cronjob")}</TableHeader>}
               {logColumns.action && <TableHeader>{t("Action")}</TableHeader>}
               {logColumns.user && <TableHeader>{t("User")}</TableHeader>}
@@ -144,6 +145,19 @@ export const LogsTableTemplate: React.FC<LogsTableTemplateProps> = ({ logs, pagi
                   </TableCell>
                 )}
 
+                {logColumns.source && (
+                  <TableCell>
+                    <Button
+                      variant="primary"
+                      label={t("Source")}
+                      icon={faArrowRight}
+                      className={styles.button}
+                      disabled={!log.context.source}
+                      onClick={(e) => handleResourceClick(e, "sources", log.context.source)}
+                    />
+                  </TableCell>
+                )}
+
                 {logColumns.cronjob && (
                   <TableCell>
                     <Button