more tweaks
handle dates & Enforce validations
support between clause