[#126] - added support for tag based fields