Moving back to arguments instead of subfields for taxonomy terms