better ElementDate handling