EDDC-456 #time 15m modified markup to reflect structure of other objet nodes