More work on date in search