restoring date / direct search, fixes #6243
Merge branch 'dev' into test