tplowe56 on "Illegal characters in tag search?"

I have 2 issues that occur in search & in Tag Cloud.

1.) The tag "Bob & Mary" does not produce results in Tag Cloud.
Using the search function to search for "Bob & Mary" produces results.
"&" character is the issue.

2.) The Tag "Johnson's" produces a server error in the Tag Cloud "Object not found!"
Using the search function "Johnson's" produces the correct result.
The apostrophe character is the issue here.

Confirmed using ZP approved theme.

Can I fix this with a code modification or would I have to re-tag all photos with these tags, a much bigger task.