fix some content problem