Adding support for shortlink expansion. Depends on patch idno/idno#547