HHH-9142 Cannot join multiple EntityMode.MAP entities

Fix for HHH-9142.