only use display_id when available
OOPS tree_map bug on update has been fixed