Handle current value when no value is given
Fix time formats