Removed the unnessesary test for subfield, as indicators have moved back as attributes.