Removed unused tag.
Added check for when no fields are present.
Updated tests.