Optimization: feature count restriction for each cell is much faster now.