Fix colliding with gitv mappings
Update link function