Add some more missing quotes in templates