Enable support for mapping values in @metadata as relationships. fixes #1506