hardening: general: removed quotation problem in many places