add gard when empty composition
work on remove dp-* tags