htmlentities and some other updates linked to equipment management