More robust field query in add_relationship_form