Bug 24807: Add suppport for uncertain fields and ranges