FIX: Proper data selections across nodes