fixed date and hour choice issues