FIXED: ignoring of base_fields
ADDED: base_fields handling for links and embedded