Added missing marko attributes and tags