MT#9263 Fix CF API handling of numbers.

Numbers must be normalized to URIs too.

(cherry picked from commit 86fffe08e1d787e937771f4bebb59329c0205b53)