Add tag closing in samples