fix unicode bug
added expiry