Fixed probs with company names in URL with white spaces