diff --git a/assets/js/entities/actions.js b/assets/js/entities/actions.js
index ec99ed9f..5d0341dd 100644
--- a/assets/js/entities/actions.js
+++ b/assets/js/entities/actions.js
@@ -22,8 +22,6 @@ function initEntitiesActions(store, router) {
                 $offset: Int = 0,
                 $after: Datetime = "1900-01-01",
                 $before: Datetime = "2100-01-01",
-                $afterTime: Datetime = "1900-01-01",
-                $beforeTime: Datetime = "2100-01-01",
                 $orderBy: [ReleasesOrderBy!]
                 $exclude: [String!]
 				$hasAuth: Boolean!
@@ -91,20 +89,19 @@ function initEntitiesActions(store, router) {
 							or: [
 								{
 									date: {
-										lessThan: $before,
-										greaterThan: $after
+										isNull: ${entityType === 'channel'}
 									}
-								},
+								}
 								{
 									date: {
-										isNull: true
-									},
-									createdAt: {
-										lessThan: $beforeTime,
-										greaterThan: $afterTime,
+										isNull: false
 									}
 								}
 							]
+							effectiveDate: {
+								lessThan: $before,
+								greaterThan: $after
+							}
 							releasesTagsConnection: {
 								none: {
 									tag: {
@@ -131,8 +128,6 @@ function initEntitiesActions(store, router) {
 			after,
 			before,
 			orderBy,
-			afterTime: store.getters.after,
-			beforeTime: store.getters.before,
 			exclude: store.state.ui.tagFilter,
 			hasAuth: !!store.state.auth.user,
 			userId: store.state.auth.user?.id,
diff --git a/assets/js/get-date-range.js b/assets/js/get-date-range.js
index 6c6b98de..e43215a1 100644
--- a/assets/js/get-date-range.js
+++ b/assets/js/get-date-range.js
@@ -3,30 +3,6 @@ import dayjs from 'dayjs';
 
 dayjs.extend(utc);
 
-const dateRanges = {
-	latest: () => ({
-		after: '1900-01-01',
-		before: dayjs.utc().toDate(),
-		orderBy: ['DATE_DESC', 'CREATED_AT_DESC'],
-	}),
-	upcoming: () => ({
-		after: dayjs.utc().toDate(),
-		before: '2100-01-01',
-		orderBy: ['DATE_ASC', 'CREATED_AT_ASC'],
-	}),
-	new: () => ({
-		after: '1900-01-01 00:00:00',
-		before: '2100-01-01',
-		orderBy: ['CREATED_AT_DESC', 'DATE_ASC'],
-	}),
-	all: () => ({
-		after: '1900-01-01',
-		before: '2100-01-01',
-		orderBy: ['DATE_DESC', 'CREATED_AT_DESC'],
-	}),
-};
-
-/* requires PostgreSQL 12.x> not available in production yet
 const dateRanges = {
 	latest: () => ({
 		after: '1900-01-01',
@@ -49,7 +25,6 @@ const dateRanges = {
 		orderBy: ['EFFECTIVE_DATE_DESC'],
 	}),
 };
-*/
 
 function getDateRange(range) {
 	return (dateRanges[range] || dateRanges.all)();