diff --git a/includes/class-sp-ajax.php b/includes/class-sp-ajax.php
index c6b35132..54c9d1a1 100644
--- a/includes/class-sp-ajax.php
+++ b/includes/class-sp-ajax.php
@@ -400,24 +400,24 @@ class SP_AJAX {
 				</p>
 				<div class="sp-date-range">
 					<p class="sp-date-range-absolute">
-						<input type="text" class="sp-datepicker-from" name="sp_date_from" value="<?php echo $date_from ? $date_from : date_i18n( 'Y-m-d' ); ?>" size="10">
+						<input type="text" class="sp-datepicker-from" name="sp_date_from" value="default" size="10">
 						:
-						<input type="text" class="sp-datepicker-to" name="sp_date_to" value="<?php echo $date_to ? $date_to : date_i18n( 'Y-m-d' ); ?>" size="10">
+						<input type="text" class="sp-datepicker-to" name="sp_date_to" value="default" size="10">
 					</p>
 
 					<p class="sp-date-range-relative">
 						<?php _e( 'Past', 'sportspress' ); ?>
-						<input type="number" min="0" step="1" class="tiny-text" name="sp_date_past" value="<?php echo '' !== $date_past ? $date_past : 7; ?>">
+						<input type="number" min="0" step="1" class="tiny-text" name="sp_date_past" value="default">
 						<?php _e( 'days', 'sportspress' ); ?>
 						&rarr;
 						<?php _e( 'Next', 'sportspress' ); ?>
-						<input type="number" min="0" step="1" class="tiny-text" name="sp_date_future" value="<?php echo '' !== $date_future ? $date_future : 7; ?>">
+						<input type="number" min="0" step="1" class="tiny-text" name="sp_date_future" value="default">
 						<?php _e( 'days', 'sportspress' ); ?>
 					</p>
 
 					<p class="sp-date-relative">
 						<label>
-							<input type="checkbox" name="sp_date_relative" value="1" id="sp_date_relative" <?php checked( $date_relative ); ?>>
+							<input type="checkbox" name="sp_date_relative" value="0" id="sp_date_relative">
 							<?php _e( 'Relative', 'sportspress' ); ?>
 						</label>
 					</p>
@@ -575,17 +575,42 @@ class SP_AJAX {
 					?>
 				</label>
 			</p>
-			<p>
-				<label>
-					<?php _e( 'Date:', 'sportspress' ); ?>
-					<select id="date" name="date">
-						<option value="default"><?php _e( 'Default', 'sportspress' ); ?></option>
-						<option value=""><?php _e( 'All', 'sportspress' ); ?></option>
-						<option value="w"><?php _e( 'This week', 'sportspress' ); ?></option>
-						<option value="day"><?php _e( 'Today', 'sportspress' ); ?></option>
-					</select>
-				</label>
-			</p>
+			<div class="sp-date-selector">
+				<p><?php _e( 'Date:', 'sportspress' ); ?> 
+					<?php
+					$args = array(
+						'name' => 'date',
+						'id' => 'date',
+						'selected' => $date,
+					);
+					sp_dropdown_dates( $args );
+					?>
+				</p>
+				<div class="sp-date-range">
+					<p class="sp-date-range-absolute">
+						<input type="text" class="sp-datepicker-from" name="sp_date_from" value="default" size="10">
+						:
+						<input type="text" class="sp-datepicker-to" name="sp_date_to" value="default" size="10">
+					</p>
+
+					<p class="sp-date-range-relative">
+						<?php _e( 'Past', 'sportspress' ); ?>
+						<input type="number" min="0" step="1" class="tiny-text" name="sp_date_past" value="default">
+						<?php _e( 'days', 'sportspress' ); ?>
+						&rarr;
+						<?php _e( 'Next', 'sportspress' ); ?>
+						<input type="number" min="0" step="1" class="tiny-text" name="sp_date_future" value="default">
+						<?php _e( 'days', 'sportspress' ); ?>
+					</p>
+
+					<p class="sp-date-relative">
+						<label>
+							<input type="checkbox" name="sp_date_relative" value="0" id="sp_date_relative">
+							<?php _e( 'Relative', 'sportspress' ); ?>
+						</label>
+					</p>
+				</div>
+			</div>
 			<p>
 				<label>
 					<?php _e( 'Match Day:', 'sportspress' ); ?>
@@ -1049,6 +1074,11 @@ class SP_AJAX {
                     args.venue = $div.find('[name=venue]').val();
                     args.status = $div.find('[name=status]').val();
                     args.date = $div.find('[name=date]').val();
+                    args.date_from = $div.find('[name=sp_date_from]').val();
+                    args.date_to = $div.find('[name=sp_date_to]').val();
+                    args.date_past = $div.find('[name=sp_date_past]').val();
+                    args.date_future = $div.find('[name=sp_date_future]').val();
+					args.date_relative = $div.find('[name=sp_date_relative]:checked').length;
                     args.day = $div.find('[name=day]').val();
                     args.number = $div.find('[name=number]').val();
                     args.order = $div.find('[name=order]').val();
@@ -1062,6 +1092,11 @@ class SP_AJAX {
                     args.venue = $div.find('[name=venue]').val();
                     args.status = $div.find('[name=status]').val();
                     args.date = $div.find('[name=date]').val();
+					args.date_from = $div.find('[name=sp_date_from]').val();
+                    args.date_to = $div.find('[name=sp_date_to]').val();
+                    args.date_past = $div.find('[name=sp_date_past]').val();
+                    args.date_future = $div.find('[name=sp_date_future]').val();
+					args.date_relative = $div.find('[name=sp_date_relative]:checked').length;
                     args.day = $div.find('[name=day]').val();
                     args.number = $div.find('[name=number]').val();
                     args.orderby = $div.find('[name=orderby]').val();