Updates to match the new non-location cms. Also added an identifier to the fields/submission fields so specific data can be fetched easier.