diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/(job)/jobs/JobTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(job)/jobs/JobTable.tsx
index de5f2ffe0..ae9771582 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/(job)/jobs/JobTable.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(job)/jobs/JobTable.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import type { JobCondition } from "@ctrlplane/validators/jobs";
 import React from "react";
 import { IconFilter, IconLoader2 } from "@tabler/icons-react";
 import _ from "lodash";
@@ -20,9 +21,9 @@ import { JobStatusReadable } from "@ctrlplane/validators/jobs";
 import { NoFilterMatch } from "~/app/[workspaceSlug]/(app)/_components/filter/NoFilterMatch";
 import { JobConditionBadge } from "~/app/[workspaceSlug]/(app)/_components/job-condition/JobConditionBadge";
 import { JobConditionDialog } from "~/app/[workspaceSlug]/(app)/_components/job-condition/JobConditionDialog";
-import { useJobFilter } from "~/app/[workspaceSlug]/(app)/_components/job-condition/useJobFilter";
 import { useJobDrawer } from "~/app/[workspaceSlug]/(app)/_components/job-drawer/useJobDrawer";
 import { JobTableStatusIcon } from "~/app/[workspaceSlug]/(app)/_components/JobTableStatusIcon";
+import { useFilter } from "~/app/[workspaceSlug]/(app)/_components/useFilter";
 import { api } from "~/trpc/react";
 
 type JobTableProps = {
@@ -30,7 +31,7 @@ type JobTableProps = {
 };
 
 export const JobTable: React.FC<JobTableProps> = ({ workspaceId }) => {
-  const { filter, setFilter } = useJobFilter();
+  const { filter, setFilter } = useFilter<JobCondition>();
   const { setJobId } = useJobDrawer();
   const allReleaseJobTriggers = api.job.config.byWorkspaceId.list.useQuery(
     { workspaceId },
@@ -38,7 +39,7 @@ export const JobTable: React.FC<JobTableProps> = ({ workspaceId }) => {
   );
 
   const releaseJobTriggers = api.job.config.byWorkspaceId.list.useQuery(
-    { workspaceId, filter, limit: 100 },
+    { workspaceId, filter: filter ?? undefined, limit: 100 },
     { refetchInterval: 10_000, placeholderData: (prev) => prev },
   );
 
@@ -91,7 +92,7 @@ export const JobTable: React.FC<JobTableProps> = ({ workspaceId }) => {
         <NoFilterMatch
           numItems={allReleaseJobTriggers.data?.total ?? 0}
           itemType="job"
-          onClear={() => setFilter(undefined)}
+          onClear={() => setFilter(null)}
         />
       )}
 
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/(targets)/layout.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(targets)/layout.tsx
index 325c94a8b..ffe5969d7 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/(targets)/layout.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(targets)/layout.tsx
@@ -171,7 +171,10 @@ export default function TargetLayout({
           )}
 
           {pathname.includes(`/${params.workspaceSlug}/target-views`) && (
-            <CreateTargetViewDialog workspaceId={workspace.data?.id ?? ""}>
+            <CreateTargetViewDialog
+              workspaceId={workspace.data?.id ?? ""}
+              filter={null}
+            >
               <Button variant="outline" size="sm" className="gap-1.5">
                 <IconPlus className="h-4 w-4" /> Add View
               </Button>
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/(targets)/targets/TargetPageContent.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(targets)/targets/TargetPageContent.tsx
index 49da553ee..b39e490bf 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/(targets)/targets/TargetPageContent.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(targets)/targets/TargetPageContent.tsx
@@ -80,7 +80,7 @@ export const TargetPageContent: React.FC<{
   view: schema.ResourceView | null;
 }> = ({ workspace, view }) => {
   const [search, setSearch] = React.useState("");
-  const { filter, setFilter, setView } = useTargetFilter();
+  const { filter, setFilter } = useTargetFilter();
 
   useDebounce(
     () => {
@@ -113,13 +113,13 @@ export const TargetPageContent: React.FC<{
     limit: 0,
   });
   const targets = api.resource.byWorkspaceId.list.useQuery(
-    { workspaceId, filter },
+    { workspaceId, filter: filter ?? undefined },
     { placeholderData: (prev) => prev },
   );
 
-  const onFilterChange = (condition: ResourceCondition | undefined) => {
+  const onFilterChange = (condition: ResourceCondition | null) => {
     const cond = condition ?? defaultCondition;
-    if (isEmptyCondition(cond)) setFilter(undefined);
+    if (isEmptyCondition(cond)) setFilter(null);
     if (!isEmptyCondition(cond)) setFilter(cond);
   };
 
@@ -173,7 +173,7 @@ export const TargetPageContent: React.FC<{
             <CreateTargetViewDialog
               workspaceId={workspace.id}
               filter={filter}
-              onSubmit={setView}
+              onSubmit={(v) => setFilter(v.filter, v.id)}
             >
               <Button className="h-7">Save view</Button>
             </CreateTargetViewDialog>
@@ -207,7 +207,7 @@ export const TargetPageContent: React.FC<{
         <NoFilterMatch
           numItems={targetsAll.data?.total ?? 0}
           itemType="target"
-          onClear={() => setFilter(undefined)}
+          onClear={() => setFilter(null)}
         />
       )}
       {targets.data != null && targets.data.total > 0 && (
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job-condition/JobConditionDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job-condition/JobConditionDialog.tsx
index 5437b47a6..fa449f2fe 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job-condition/JobConditionDialog.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job-condition/JobConditionDialog.tsx
@@ -14,14 +14,15 @@ import {
 import { MAX_DEPTH_ALLOWED } from "@ctrlplane/validators/conditions";
 import {
   defaultCondition,
+  isEmptyCondition,
   isValidJobCondition,
 } from "@ctrlplane/validators/jobs";
 
 import { JobConditionRender } from "./JobConditionRender";
 
 type JobConditionDialogProps = {
-  condition?: JobCondition;
-  onChange: (condition: JobCondition | undefined) => void;
+  condition: JobCondition | null;
+  onChange: (condition: JobCondition | null) => void;
   children: React.ReactNode;
 };
 
@@ -73,9 +74,13 @@ export const JobConditionDialog: React.FC<JobConditionDialogProps> = ({
                 );
                 return;
               }
-              onChange(localCondition);
               setOpen(false);
               setError(null);
+              if (isEmptyCondition(localCondition)) {
+                onChange(null);
+                return;
+              }
+              onChange(localCondition);
             }}
           >
             Save
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job-condition/useJobFilter.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job-condition/useJobFilter.ts
deleted file mode 100644
index 3326eb988..000000000
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job-condition/useJobFilter.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import type { JobCondition } from "@ctrlplane/validators/jobs";
-import { useCallback, useMemo } from "react";
-import { useRouter, useSearchParams } from "next/navigation";
-import LZString from "lz-string";
-
-export const useJobFilter = () => {
-  const urlParams = useSearchParams();
-  const router = useRouter();
-
-  const filter = useMemo<JobCondition | undefined>(() => {
-    const filterJson = urlParams.get("job-filter");
-    if (filterJson == null) return undefined;
-    try {
-      return JSON.parse(LZString.decompressFromEncodedURIComponent(filterJson));
-    } catch {
-      return undefined;
-    }
-  }, [urlParams]);
-
-  const setFilter = useCallback(
-    (filter: JobCondition | undefined) => {
-      if (filter == null) {
-        const query = new URLSearchParams(window.location.search);
-        query.delete("job-filter");
-        router.replace(`?${query.toString()}`);
-        return;
-      }
-
-      const filterJson = LZString.compressToEncodedURIComponent(
-        JSON.stringify(filter),
-      );
-      const query = new URLSearchParams(window.location.search);
-      query.set("job-filter", filterJson);
-      router.replace(`?${query.toString()}`);
-    },
-    [router],
-  );
-
-  return { filter, setFilter };
-};
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release-channel-drawer/Overview.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release-channel-drawer/Overview.tsx
index 898b5ed9e..3c71b7280 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release-channel-drawer/Overview.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release-channel-drawer/Overview.tsx
@@ -46,6 +46,7 @@ const getFinalFilter = (filter: ReleaseCondition | null) =>
 
 const getReleaseFilterUrl = (
   workspaceSlug: string,
+  releaseChannelId: string,
   systemSlug?: string,
   deploymentSlug?: string,
   filter?: ReleaseCondition,
@@ -56,7 +57,7 @@ const getReleaseFilterUrl = (
   const filterHash = LZString.compressToEncodedURIComponent(
     JSON.stringify(filter),
   );
-  return `${baseUrl}/releases?filter=${filterHash}`;
+  return `${baseUrl}/releases?filter=${filterHash}&release-channel-id=${releaseChannelId}`;
 };
 
 const schema = z.object({
@@ -108,9 +109,7 @@ export const Overview: React.FC<OverviewProps> = ({ releaseChannel }) => {
       .then(() =>
         utils.deployment.releaseChannel.byId.invalidate(releaseChannel.id),
       )
-      .then(() => {
-        if (paramFilter != null) setFilter(releaseFilter);
-      })
+      .then(() => paramFilter != null && setFilter(releaseFilter ?? null))
       .then(() => router.refresh());
   });
 
@@ -125,6 +124,7 @@ export const Overview: React.FC<OverviewProps> = ({ releaseChannel }) => {
   const releases = releasesQ.data;
   const releaseFilterUrl = getReleaseFilterUrl(
     workspaceSlug,
+    releaseChannel.id,
     systemSlug,
     deploymentSlug,
     filter,
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release-channel-drawer/ReleaseChannelDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release-channel-drawer/ReleaseChannelDropdown.tsx
index 2bcd06a3d..8ba60e01f 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release-channel-drawer/ReleaseChannelDropdown.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release-channel-drawer/ReleaseChannelDropdown.tsx
@@ -22,8 +22,7 @@ import {
 } from "@ctrlplane/ui/dropdown-menu";
 
 import { api } from "~/trpc/react";
-import { useReleaseFilter } from "../release-condition/useReleaseFilter";
-import { useReleaseChannelDrawer } from "./useReleaseChannelDrawer";
+import { useQueryParams } from "../useQueryParams";
 
 type DeleteReleaseChannelDialogProps = {
   releaseChannelId: string;
@@ -37,16 +36,22 @@ const DeleteReleaseChannelDialog: React.FC<DeleteReleaseChannelDialogProps> = ({
   children,
 }) => {
   const [open, setOpen] = useState(false);
-  const { removeReleaseChannelId } = useReleaseChannelDrawer();
-  const { setFilter } = useReleaseFilter();
+  const { setParams } = useQueryParams();
   const router = useRouter();
   const deleteReleaseChannel =
     api.deployment.releaseChannel.delete.useMutation();
   const onDelete = () =>
     deleteReleaseChannel
       .mutateAsync(releaseChannelId)
-      .then(() => removeReleaseChannelId())
-      .then(() => setFilter(undefined, null))
+      .then(() =>
+        // setting params one at a time does not work and only makes one change
+        // so we directly set all params to null at once
+        setParams({
+          "release-channel-id": null,
+          release_channel_id: null,
+          filter: null,
+        }),
+      )
       .then(() => router.refresh())
       .then(() => setOpen(false));
 
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release-condition/ReleaseConditionDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release-condition/ReleaseConditionDialog.tsx
index ba0e358c4..99b03f0a2 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release-condition/ReleaseConditionDialog.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release-condition/ReleaseConditionDialog.tsx
@@ -26,6 +26,7 @@ import {
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@ctrlplane/ui/tabs";
 import {
   defaultCondition,
+  isEmptyCondition,
   isValidReleaseCondition,
   MAX_DEPTH_ALLOWED,
 } from "@ctrlplane/validators/releases";
@@ -36,10 +37,10 @@ import { ReleaseConditionRender } from "./ReleaseConditionRender";
 import { useReleaseFilter } from "./useReleaseFilter";
 
 type ReleaseConditionDialogProps = {
-  condition?: ReleaseCondition;
+  condition: ReleaseCondition | null;
   deploymentId?: string;
   onChange: (
-    condition: ReleaseCondition | undefined,
+    condition: ReleaseCondition | null,
     releaseChannelId?: string | null,
   ) => void;
   releaseChannels?: SCHEMA.ReleaseChannel[];
@@ -58,16 +59,17 @@ export const ReleaseConditionDialog: React.FC<ReleaseConditionDialogProps> = ({
   const { setFilter, releaseChannelId } = useReleaseFilter();
 
   const [localReleaseChannelId, setLocalReleaseChannelId] = useState<
-    string | undefined
+    string | null
   >(releaseChannelId);
 
-  const [localCondition, setLocalCondition] = useState<
-    ReleaseCondition | undefined
-  >(condition ?? defaultCondition);
+  const [localCondition, setLocalCondition] = useState<ReleaseCondition | null>(
+    condition ?? defaultCondition,
+  );
   const isLocalConditionValid =
     localCondition == null || isValidReleaseCondition(localCondition);
+  const filter = localCondition ?? undefined;
   const releasesQ = api.release.list.useQuery(
-    { deploymentId: deploymentId ?? "", filter: localCondition, limit: 5 },
+    { deploymentId: deploymentId ?? "", filter, limit: 5 },
     { enabled: deploymentId != null && isLocalConditionValid },
   );
   const releases = releasesQ.data;
@@ -107,14 +109,14 @@ export const ReleaseConditionDialog: React.FC<ReleaseConditionDialogProps> = ({
               </DialogDescription>
             </DialogHeader>
             <Select
-              value={localReleaseChannelId}
+              value={localReleaseChannelId ?? undefined}
               onValueChange={(value) => {
                 const releaseChannel = releaseChannels.find(
                   (rc) => rc.id === value,
                 );
                 if (releaseChannel == null) return;
                 setLocalReleaseChannelId(value);
-                setLocalCondition(releaseChannel.releaseFilter ?? undefined);
+                setLocalCondition(releaseChannel.releaseFilter);
               }}
             >
               <SelectTrigger>
@@ -141,7 +143,7 @@ export const ReleaseConditionDialog: React.FC<ReleaseConditionDialogProps> = ({
                   );
                   if (releaseChannel == null) return;
                   setFilter(
-                    releaseChannel.releaseFilter ?? undefined,
+                    releaseChannel.releaseFilter,
                     localReleaseChannelId,
                   );
                   setOpen(false);
@@ -189,9 +191,17 @@ export const ReleaseConditionDialog: React.FC<ReleaseConditionDialogProps> = ({
                     );
                     return;
                   }
-                  onChange(localCondition, null);
                   setOpen(false);
                   setError(null);
+
+                  if (
+                    localCondition != null &&
+                    isEmptyCondition(localCondition)
+                  ) {
+                    onChange(null, null);
+                    return;
+                  }
+                  onChange(localCondition, null);
                 }}
               >
                 Save
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release-condition/useReleaseFilter.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release-condition/useReleaseFilter.ts
index 4f110e262..a2908ef83 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release-condition/useReleaseFilter.ts
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release-condition/useReleaseFilter.ts
@@ -1,50 +1,40 @@
 import type { ReleaseCondition } from "@ctrlplane/validators/releases";
 import { useCallback, useMemo } from "react";
-import { useRouter, useSearchParams } from "next/navigation";
 import LZString from "lz-string";
 
+import { useQueryParams } from "../useQueryParams";
+
 export const useReleaseFilter = () => {
-  const urlParams = useSearchParams();
-  const router = useRouter();
+  const { getParam, setParams } = useQueryParams();
 
-  const filter = useMemo<ReleaseCondition | undefined>(() => {
-    const filterJson = urlParams.get("filter");
-    if (filterJson == null) return undefined;
+  const filterHash = getParam("filter");
+  const filter = useMemo<ReleaseCondition | null>(() => {
+    if (filterHash == null) return null;
     try {
-      return JSON.parse(LZString.decompressFromEncodedURIComponent(filterJson));
+      return JSON.parse(LZString.decompressFromEncodedURIComponent(filterHash));
     } catch {
-      return undefined;
+      return null;
     }
-  }, [urlParams]);
+  }, [filterHash]);
 
-  const releaseChannelId = useMemo<string | undefined>(
-    () => urlParams.get("release-channel") ?? undefined,
-    [urlParams],
-  );
+  const releaseChannelId = getParam("release-channel-id");
 
   const setFilter = useCallback(
-    (filter?: ReleaseCondition, releaseChannelId?: string | null) => {
-      if (filter == null) {
-        const query = new URLSearchParams(window.location.search);
-        query.delete("filter");
-        if (releaseChannelId === null) query.delete("release-channel");
-        if (releaseChannelId != null)
-          query.set("release_channel_id", releaseChannelId);
-        router.replace(`?${query.toString()}`);
+    (filter: ReleaseCondition | null, releaseChannelId?: string | null) => {
+      const filterJsonHash =
+        filter != null
+          ? LZString.compressToEncodedURIComponent(JSON.stringify(filter))
+          : null;
+      if (releaseChannelId === undefined) {
+        setParams({ filter: filterJsonHash });
         return;
       }
-
-      const filterJsonHash = LZString.compressToEncodedURIComponent(
-        JSON.stringify(filter),
-      );
-      const query = new URLSearchParams(window.location.search);
-      query.set("filter", filterJsonHash);
-      if (releaseChannelId != null)
-        query.set("release_channel_id", releaseChannelId);
-      if (releaseChannelId === null) query.delete("release_channel_id");
-      router.replace(`?${query.toString()}`);
+      setParams({
+        filter: filterJsonHash,
+        "release-channel-id": releaseChannelId,
+      });
     },
-    [router],
+    [setParams],
   );
 
   return {
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/target-condition/TargetConditionDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/target-condition/TargetConditionDialog.tsx
index 19a9dc312..1fa7434e3 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/target-condition/TargetConditionDialog.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/target-condition/TargetConditionDialog.tsx
@@ -26,8 +26,8 @@ import { TargetConditionRender } from "./TargetConditionRender";
 import { TargetViewForm, targetViewFormSchema } from "./TargetViewForm";
 
 type TargetConditionDialogProps = {
-  condition?: ResourceCondition;
-  onChange: (condition: ResourceCondition | undefined) => void;
+  condition: ResourceCondition | null;
+  onChange: (condition: ResourceCondition | null) => void;
   children: React.ReactNode;
 };
 
@@ -94,7 +94,7 @@ export const TargetConditionDialog: React.FC<TargetConditionDialogProps> = ({
 
 type CreateTargetViewDialogProps = {
   workspaceId: string;
-  filter?: ResourceCondition;
+  filter: ResourceCondition | null;
   onSubmit?: (view: schema.ResourceView) => void;
   children: React.ReactNode;
 };
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/target-condition/TargetViewActionsDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/target-condition/TargetViewActionsDropdown.tsx
index 9c15036f1..3641a822b 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/target-condition/TargetViewActionsDropdown.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/target-condition/TargetViewActionsDropdown.tsx
@@ -34,7 +34,7 @@ const DeleteTargetViewDialog: React.FC<{
 }> = ({ viewId, onClose, children }) => {
   const [open, setOpen] = useState(false);
   const deleteTargetView = api.resource.view.delete.useMutation();
-  const { removeView } = useTargetFilter();
+  const { setFilter } = useTargetFilter();
 
   return (
     <AlertDialog
@@ -63,7 +63,7 @@ const DeleteTargetViewDialog: React.FC<{
             onClick={() =>
               deleteTargetView
                 .mutateAsync(viewId)
-                .then(removeView)
+                .then(() => setFilter(null, null))
                 .then(onClose)
             }
           >
@@ -82,7 +82,8 @@ export const TargetViewActionsDropdown: React.FC<{
   const [open, setOpen] = useState(false);
   const pathname = usePathname();
   const isTargetPage = pathname.includes("/targets");
-  const { setView } = useTargetFilter();
+  const { setFilter } = useTargetFilter();
+  const setView = (v: schema.ResourceView) => setFilter(v.filter, v.id);
 
   return (
     <DropdownMenu open={open} onOpenChange={setOpen}>
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/target-condition/useTargetFilter.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/target-condition/useTargetFilter.ts
index ea6609498..879c0cffe 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/target-condition/useTargetFilter.ts
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/target-condition/useTargetFilter.ts
@@ -1,61 +1,38 @@
-import type * as schema from "@ctrlplane/db/schema";
 import type { ResourceCondition } from "@ctrlplane/validators/resources";
 import { useCallback, useMemo } from "react";
-import { useRouter, useSearchParams } from "next/navigation";
 import LZString from "lz-string";
 
+import { useQueryParams } from "../useQueryParams";
+
 export const useTargetFilter = () => {
-  const urlParams = useSearchParams();
-  const router = useRouter();
+  const { getParam, setParams } = useQueryParams();
 
-  const filter = useMemo<ResourceCondition | undefined>(() => {
-    const filterJson = urlParams.get("filter");
-    if (filterJson == null) return undefined;
+  const filterHash = getParam("filter");
+  const filter = useMemo<ResourceCondition | null>(() => {
+    if (filterHash == null) return null;
     try {
-      return JSON.parse(LZString.decompressFromEncodedURIComponent(filterJson));
+      return JSON.parse(LZString.decompressFromEncodedURIComponent(filterHash));
     } catch {
-      return undefined;
+      return null;
     }
-  }, [urlParams]);
+  }, [filterHash]);
+
+  const viewId = getParam("view");
 
   const setFilter = useCallback(
-    (filter: ResourceCondition | undefined) => {
-      if (filter == null) {
-        const query = new URLSearchParams(window.location.search);
-        query.delete("filter");
-        router.replace(`?${query.toString()}`);
+    (filter: ResourceCondition | null, viewId?: string | null) => {
+      const filterJsonHash =
+        filter != null
+          ? LZString.compressToEncodedURIComponent(JSON.stringify(filter))
+          : null;
+      if (viewId === undefined) {
+        setParams({ filter: filterJsonHash });
         return;
       }
-
-      const filterJson = LZString.compressToEncodedURIComponent(
-        JSON.stringify(filter),
-      );
-      const query = new URLSearchParams(window.location.search);
-      query.set("filter", filterJson);
-      router.replace(`?${query.toString()}`);
+      setParams({ filter: filterJsonHash, view: viewId });
     },
-    [router],
+    [setParams],
   );
 
-  const setView = useCallback(
-    (view: schema.ResourceView) => {
-      const query = new URLSearchParams(window.location.search);
-      const filterJson = LZString.compressToEncodedURIComponent(
-        JSON.stringify(view.filter),
-      );
-      query.set("filter", filterJson);
-      query.set("view", view.id);
-      router.replace(`?${query.toString()}`);
-    },
-    [router],
-  );
-
-  const removeView = () => {
-    const query = new URLSearchParams(window.location.search);
-    query.delete("view");
-    query.delete("filter");
-    router.replace(`?${query.toString()}`);
-  };
-
-  return { filter, setFilter, setView, removeView };
+  return { filter, setFilter, viewId };
 };
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/useFilter.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/useFilter.ts
new file mode 100644
index 000000000..e742d3aa1
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/useFilter.ts
@@ -0,0 +1,35 @@
+import { useCallback, useMemo } from "react";
+import LZString from "lz-string";
+
+import { useQueryParams } from "./useQueryParams";
+
+export const useFilter = <T extends object>() => {
+  const { getParam, setParams } = useQueryParams();
+
+  const filterHash = getParam("filter");
+  const filter = useMemo<T | null>(() => {
+    if (filterHash == null) return null;
+    try {
+      return JSON.parse(LZString.decompressFromEncodedURIComponent(filterHash));
+    } catch {
+      return null;
+    }
+  }, [filterHash]);
+
+  const setFilter = useCallback(
+    (filter: T | null) => {
+      try {
+        const filterJsonHash =
+          filter != null
+            ? LZString.compressToEncodedURIComponent(JSON.stringify(filter))
+            : null;
+        setParams({ filter: filterJsonHash });
+      } catch {
+        setParams({ filter: null });
+      }
+    },
+    [setParams],
+  );
+
+  return { filter, setFilter };
+};
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/_components/useQueryParams.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/useQueryParams.ts
new file mode 100644
index 000000000..100d79c0c
--- /dev/null
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/useQueryParams.ts
@@ -0,0 +1,30 @@
+"use client";
+
+import { useCallback } from "react";
+import { useRouter, useSearchParams } from "next/navigation";
+
+export const useQueryParams = () => {
+  const urlParams = useSearchParams();
+  const router = useRouter();
+
+  const getParam = useCallback(
+    (key: string) => urlParams.get(key),
+    [urlParams],
+  );
+
+  const setParams = useCallback(
+    (params: Record<string, string | null>) => {
+      const query = new URLSearchParams(window.location.search);
+
+      Object.entries(params).forEach(([key, value]) => {
+        if (value == null) query.delete(key);
+        if (value != null) query.set(key, value);
+      });
+
+      router.replace(`?${query.toString()}`);
+    },
+    [router],
+  );
+
+  return { getParam, setParams };
+};
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/systems/[systemSlug]/_components/variables/ConfigFields.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/systems/[systemSlug]/_components/variables/ConfigFields.tsx
index b54b10052..96aa963e0 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/systems/[systemSlug]/_components/variables/ConfigFields.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/systems/[systemSlug]/_components/variables/ConfigFields.tsx
@@ -275,7 +275,7 @@ type RunbookConfigFieldsFC<T extends RunbookVariableConfigType> = React.FC<{
 export const ResourceConfigFields: RunbookConfigFieldsFC<
   ResourceVariableConfigType
 > = ({ config, updateConfig }) => {
-  const onFilterChange = (condition: ResourceCondition | undefined) => {
+  const onFilterChange = (condition: ResourceCondition | null) => {
     const cond = condition ?? defaultCondition;
     if (isEmptyCondition(cond)) updateConfig({ ...config, filter: undefined });
     if (!isEmptyCondition(cond)) updateConfig({ ...config, filter: cond });
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/systems/[systemSlug]/deployments/[deploymentSlug]/releases/DeploymentPageContent.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/systems/[systemSlug]/deployments/[deploymentSlug]/releases/DeploymentPageContent.tsx
index 14fc0f9e8..1ccdb017d 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/systems/[systemSlug]/deployments/[deploymentSlug]/releases/DeploymentPageContent.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/systems/[systemSlug]/deployments/[deploymentSlug]/releases/DeploymentPageContent.tsx
@@ -51,7 +51,7 @@ export const DeploymentPageContent: React.FC<DeploymentPageContentProps> = ({
   }>();
 
   const releases = api.release.list.useQuery(
-    { deploymentId: deployment.id, filter, limit: 30 },
+    { deploymentId: deployment.id, filter: filter ?? undefined, limit: 30 },
     { refetchInterval: 2_000 },
   );
 
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/systems/[systemSlug]/deployments/[deploymentSlug]/releases/[versionId]/TargetReleaseTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/systems/[systemSlug]/deployments/[deploymentSlug]/releases/[versionId]/TargetReleaseTable.tsx
index fd803e282..20d4b326d 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/systems/[systemSlug]/deployments/[deploymentSlug]/releases/[versionId]/TargetReleaseTable.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/systems/[systemSlug]/deployments/[deploymentSlug]/releases/[versionId]/TargetReleaseTable.tsx
@@ -2,7 +2,7 @@
 
 import type { RouterOutputs } from "@ctrlplane/api";
 import type * as SCHEMA from "@ctrlplane/db/schema";
-import type { JobStatus } from "@ctrlplane/validators/jobs";
+import type { JobCondition, JobStatus } from "@ctrlplane/validators/jobs";
 import React, { Fragment, useState } from "react";
 import Link from "next/link";
 import {
@@ -31,9 +31,9 @@ import { JobStatusReadable } from "@ctrlplane/validators/jobs";
 
 import { JobConditionBadge } from "~/app/[workspaceSlug]/(app)/_components/job-condition/JobConditionBadge";
 import { JobConditionDialog } from "~/app/[workspaceSlug]/(app)/_components/job-condition/JobConditionDialog";
-import { useJobFilter } from "~/app/[workspaceSlug]/(app)/_components/job-condition/useJobFilter";
 import { useJobDrawer } from "~/app/[workspaceSlug]/(app)/_components/job-drawer/useJobDrawer";
 import { JobTableStatusIcon } from "~/app/[workspaceSlug]/(app)/_components/JobTableStatusIcon";
+import { useFilter } from "~/app/[workspaceSlug]/(app)/_components/useFilter";
 import { api } from "~/trpc/react";
 import { JobDropdownMenu } from "./JobDropdownMenu";
 import { PolicyApprovalRow } from "./PolicyApprovalRow";
@@ -411,9 +411,9 @@ export const TargetReleaseTable: React.FC<TargetReleaseTableProps> = ({
   deployment,
   environments,
 }) => {
-  const { filter, setFilter } = useJobFilter();
+  const { filter, setFilter } = useFilter<JobCondition>();
   const releaseJobTriggerQuery = api.job.config.byReleaseId.useQuery(
-    { releaseId: release.id, filter },
+    { releaseId: release.id, filter: filter ?? undefined },
     { refetchInterval: 5_000 },
   );
   const releaseJobTriggers = releaseJobTriggerQuery.data ?? [];
diff --git a/apps/webservice/src/app/[workspaceSlug]/(app)/systems/[systemSlug]/deployments/[deploymentSlug]/releases/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/systems/[systemSlug]/deployments/[deploymentSlug]/releases/page.tsx
index 153ee6f36..359697b73 100644
--- a/apps/webservice/src/app/[workspaceSlug]/(app)/systems/[systemSlug]/deployments/[deploymentSlug]/releases/page.tsx
+++ b/apps/webservice/src/app/[workspaceSlug]/(app)/systems/[systemSlug]/deployments/[deploymentSlug]/releases/page.tsx
@@ -8,7 +8,7 @@ import { DeploymentPageContent } from "./DeploymentPageContent";
 
 type PageProps = {
   params: { workspaceSlug: string; systemSlug: string; deploymentSlug: string };
-  searchParams: { "release-channel"?: string };
+  searchParams: { "release-channel-id"?: string };
 };
 
 export async function generateMetadata({
@@ -30,8 +30,10 @@ export default async function DeploymentPage({
   if (deployment == null) return notFound();
   const { system } = deployment;
   const environments = await api.environment.bySystemId(system.id);
-  const releaseChannel = searchParams["release-channel"]
-    ? await api.deployment.releaseChannel.byId(searchParams["release-channel"])
+  const releaseChannel = searchParams["release-channel-id"]
+    ? await api.deployment.releaseChannel.byId(
+        searchParams["release-channel-id"],
+      )
     : null;
   return (
     <DeploymentPageContent