Fixed issue where ampersands were being stored in the db incorrectly