Made changes updating url string matching for server