Expanded or filters - closes #40