Content insert/update handling fix