Added smarter search on today/tomorrow/weekend