Added fixes for turbo links