diff --git a/README.md b/README.md
index 33da056..7deff00 100644
--- a/README.md
+++ b/README.md
@@ -43,6 +43,7 @@ plugins=(… zsh-fzf-history-search)
 | `ZSH_FZF_HISTORY_SEARCH_FZF_EXTRA_ARGS`   | Extra arguments for `fzf` (default: `''`)                                                         |
 | `ZSH_FZF_HISTORY_SEARCH_END_OF_LINE`      | Put the cursor on at the end of the line after completion, `empty=false` (default: `''`)          |
 | `ZSH_FZF_HISTORY_SEARCH_EVENT_NUMBERS`    | Include event numbers in search.  Set to 0 to remove event numbers from the search. (default: `1`)|
+| `ZSH_FZF_HISTORY_SEARCH_DATES_IN_SEARCH`  | Include ISO8601 timestamps in search.  Set to 0 to remove them from the search. (default: `1`)    |
 
 
 ## TODO
diff --git a/zsh-fzf-history-search.zsh b/zsh-fzf-history-search.zsh
index c128f82..264aa32 100644
--- a/zsh-fzf-history-search.zsh
+++ b/zsh-fzf-history-search.zsh
@@ -21,15 +21,24 @@ typeset -g ZSH_FZF_HISTORY_SEARCH_END_OF_LINE=''
 (( ! ${+ZSH_FZF_HISTORY_SEARCH_EVENT_NUMBERS} )) &&
 typeset -g ZSH_FZF_HISTORY_SEARCH_EVENT_NUMBERS=1
 
+# Include full date timestamps in ISO8601 `yyyy-mm-dd hh:mm' format
+(( ! ${+ZSH_FZF_HISTORY_SEARCH_DATES_IN_SEARCH} )) &&
+typeset -g ZSH_FZF_HISTORY_SEARCH_DATES_IN_SEARCH=1
+
 fzf_history_search() {
   setopt extendedglob
 
-  FC_ARGS="-li"
-  CANDIDATE_LEADING_FIELDS=4
+  FC_ARGS="-l"
+  CANDIDATE_LEADING_FIELDS=2
 
   if (( ! $ZSH_FZF_HISTORY_SEARCH_EVENT_NUMBERS )); then
     FC_ARGS+=" -n"
-    CANDIDATE_LEADING_FIELDS=3
+    ((CANDIDATE_LEADING_FIELDS--))
+  fi
+
+  if (( $ZSH_FZF_HISTORY_SEARCH_DATES_IN_SEARCH )); then
+    FC_ARGS+=" -i"
+    ((CANDIDATE_LEADING_FIELDS+=2))
   fi
 
   candidates=(${(f)"$(fc ${=FC_ARGS} -1 0 | fzf ${=ZSH_FZF_HISTORY_SEARCH_FZF_ARGS} ${=ZSH_FZF_HISTORY_SEARCH_FZF_EXTRA_ARGS} -q "$BUFFER")"})