Mixed queries: add missing test, fix case, and remove the case (since invalid in the controller)
LK tweaks