Added wrap with tag snippets