Expanding joiner to AND and OR