Fix bug with quotes and apostrophes appearing in strings messing everything up