Multi-fields behavior reworked