Check more query strings at boot time.

And therefore don't check query[0] at run time