Replace all extra characters with commas in queries; improves matching