Fix cancel behaviour and add the custom value to the summary