Couple of tweaks to response and template

Signed-off-by: emanuele <emanuele45@gmail.com>