Making the changes to help the queries in MonetaryFields and Range filters.