Update to SOQL builder to prevent exception on date and date/time fields