fixing missing '@' in variables
fixing missing '@' in variables found in templates