Clean up embedded serializer for belongsTo and fix context when extracting