VB template polishing
Hardening templates for missing @body