Force emptyToNull for from and until fields