relax switchQuery.
Merge branch 'develop'

relax switchQuery.

              old   new
    key       True  True
    key=true  False True
    key=false False False