fixed a bad combined csv file; fixed double application of htmlentities ...

...on some strings in convert.php