Improved handling of datetimes and reply contexts, improved consistency of resource keys