Use expandurl instead of unshort