STORM-585 is fixed: Performance improvement in none grouping