Improved handling of content in fields