fixes type and uses short links