improve handler and update templates
update templates
change param name