Added removing the empty conditions on the outside of the clusters and added the functionnality groupping together conditions inside the clusters