Fix stopword subquery generation