Small performance improvement when an invalid date is entered
Fixed merge controllers
Small performance improvement when an invalid date is entered