escape null on update
refactor ocicursor