Include variation-selectors in cluster calculation