Freemarker minor updates due to the changes in RedDeer