Partial correction to problem with boolean field returning choices