Fix #398, #410, escape field with enum / postgres