Fix for 7494

- Rever to search/creationdate