Fix templates and add processing request