Added expire information to links
Some fixes due HTML support