Stream url selection improvement