* Fixed display of expiration on inline-parsed keys
* Escaped more values
* Removed comment out method