Added support for storing numbers as such so that they can used for filtering with logical operators