Added limiting per shard
Fixed merge conflict