Fix bug, not using resolved field values
Fix bug, not using contact data uri
Some renaming
Need to set resolve fields, to actually use what use chose