mod_rewrite - Comma In URL

I have been at this for awhile and can't find a solution.

I have this line in my .htaccess:
RewriteRule ^([A-Za-z0-9]+)/([A-Za-z0-9]+)/([0-9]+)$ /search.php?query=$1&location=$2&zip=$3

Location can take commas that are returned as %2C in the URL. Example: City,State. If I search using just a city name it works, but if I search using City,State it doesn't work. How can I add a comma into the regular expression?

 

Is this impossible?

 

([^.]+)

if that doesn't do it

(.*)

 

Thanks. Now I know why when I used (*.) I got errors.