Fixed Date overlap logic
remoged some extra alerts