Yury/empty start date bug fix