Adding correct fields for DateTimeType
Removing all unnecessary query builders