Even more sharing
cleanup
Removes unnecessary date encoding
TODO: escaped chars parsing