Bug Fix: Updated NumberOrStringField to handle None