Use new location metadata fields

[slifty]

We're working to update the location metadata system in permanent, which will come with some new fields. We need to update our code to use these fields!