CDK-140: cancel-button does not pass along correct id parameter