Better handling of constructed in-place update queries