Fix display empty fields and escaping function