Add ampersands and quotes.

Should catch more cases.