improvements in generated delete/update actions