Fix flow to avoid work stealing
Handling multiple entities