Fixed issue with clicking when there is no grouping...