Improve xml view snippets
Merge