fixes to component upsert generator