BLD-525: Fix Numerical input to support mathematical operations.