Fixed regex bug with NUMERIC and fixed massive bug with numeric. Added order independent entry for BETWEEN