Previously they were only allowed in if statements. Also update the if statement condition to allow comparisons to the search term. Bug: 201700692 Test: go test Change-Id: I8bee8f716819d383423c0de233ab970e49890543