Fixed terms search query badness
Minor query args rearrangement