Revert "Simplify generated queries"
Revert "Simplify generated queries"

This reverts commit e6b57f637ce82b129d3e2e039ce86456d1495385.

mikelkew/searchkick,ankane/searchkick,mikelkew/searchkick,johan--/searchkick,spanner/searchkick,spanner/searchkick,johan--/searchkick