fixed issues for %date/%time