Improved numeric value checking so new ICP data uploads correctly