Use directly datarecord id instead of previously stored value which may not be up to date.
aae75f1
c9b690f6b6