refs #748 Fix upserts by hydrating the pk query with field names