Fix - Edit/Read item text #362 and #364