Fix content modification so we don't throw most of it away
Fix broken input field