Add url shortener.
Catch a few more messages than before.