Clean up variables just a tich

- Replace template with merge_tags field for efficiency / simplicity
- Fields required are core - so no lang needed there
- Replace all template / template with merge_tags / pattern