diff --git a/src/main.sh b/src/main.sh
index 0a0af2c..d7a51f5 100755
--- a/src/main.sh
+++ b/src/main.sh
@@ -573,26 +573,8 @@ DISPLAY_DATE=$(date -d "$DISPLAY_DATE" +"%D")
 DISPLAY_POS=$((8 - $(date -d "$DISPLAY_DATE" +"%u")))
 
 if [ "${1:-}" = "--list" ]; then
-  if [ -n "$3" ]; then
-    DISPLAY_DATE="$2 $3"
-  else
-    DISPLAY_DATE="today"
-  fi
-  echo "$DISPLAY_DATE" >>/tmp/xyz
-  DISPLAY_POS=$((8 - $(date -d "$DISPLAY_DATE" +"%u")))
-  __list
-  exit
-fi
-
-if [ "${1:-}" = "--list-prev-day" ]; then
-  DISPLAY_DATE="$2 -1 days"
-  DISPLAY_POS=$((8 - $(date -d "$DISPLAY_DATE" +"%u")))
-  __list
-  exit
-fi
-
-if [ "${1:-}" = "--list-next-day" ]; then
-  DISPLAY_DATE="$2 +7 days"
+  shift
+  DISPLAY_DATE=${*:-today}
   DISPLAY_POS=$((8 - $(date -d "$DISPLAY_DATE" +"%u")))
   __list
   exit
@@ -617,18 +599,18 @@ selection=$(
       --preview="$0 --preview-week {}" \
       --expect="ctrl-n" \
       --bind="ctrl-j:transform:[ \$FZF_POS -le 1 ] &&
-      echo unbind\(load\)+reload:$0 --list-next-day {2} ||
+      echo unbind\(load\)+reload:$0 --list {2} '+1 day'||
       echo down" \
       --bind="ctrl-k:transform:[ \$FZF_POS -ge 7 ] &&
-      echo unbind\(load\)+reload:$0 --list-prev-day {2} ||
+      echo unbind\(load\)+reload:$0 --list {2} '-1 day'||
       echo up" \
       --bind="change:reload($0 --all)+hide-preview" \
-      --bind="backward-eof:reload($0 --list)+show-preview" \
+      --bind="backward-eof:rebind(load)+reload($0 --list)+show-preview" \
       --bind="load:pos($DISPLAY_POS)" \
-      --bind="ctrl-u:reload:$0 --list {2} '-1 week'" \
-      --bind="ctrl-d:reload:$0 --list {2} '+1 week'" \
-      --bind="ctrl-alt-u:reload:$0 --list {2} '-1 month'" \
-      --bind="ctrl-alt-d:reload:$0 --list {2} '+1 month'" \
+      --bind="ctrl-u:unbind(load)+reload:$0 --list {2} '-1 week'" \
+      --bind="ctrl-d:unbind(load)+reload:$0 --list {2} '+1 week'" \
+      --bind="ctrl-alt-u:unbind(load)+reload:$0 --list {2} '-1 month'" \
+      --bind="ctrl-alt-d:unbind(load)+reload:$0 --list {2} '+1 month'" \
       --bind="ctrl-s:execute($SYNC_CMD ; printf 'Press <enter> to continue.'; read -r tmp)" \
       --bind="ctrl-g:become($0 --goto)" \
       --bind="ctrl-l:rebind(load)+reload:$0 --list"