Fixed host insertion and update