Improve parser to deal with bad names ending with and ampersand