Removing ", City Of" since cause problems for matches