Add conditional / marginal to visual filters - addresses #7