LP#1757526: escape more catalog data (MFHD edition)