content field handling improved.