fix wrong templates being called by handlers