fix for updated template tag name
Cleanup on settings