Fix for 7494

- Use display/creationdate