simplify dynamic field entity fields.
add default bundle handling