Task reorg 1 cleanup

Can probably replace this with `as: :url,`