time format fix

Fix on the date formats to support 12/24h time options