more shard split logic fixes