Fixed the original buffer to work with fielded tags and modified fielded
tags to work better.