Use old query structure to improve ranking

Copy the query structure used for the old endpoint to improve the
ranking produced.  This ranking isn't great, but is significantly better
than the pure elasticsearch ranking, and we're going to start by just
making minor tweaks to this until we have the ability to use features
based on popularity and click through as a base of our ranking.

This is for https://www.pivotaltracker.com/story/show/69916060

After applying this patch, my local healthcheck returns:

    INFO  Mainstream score: 614015/1237544 (49.62%)
    INFO  1121 of 1825 succeeded
    INFO  Government score: 25017/47459 (52.71%)
    INFO  411 of 734 succeeded
    INFO  Detailed score: 5319/8180 (65.02%)
    INFO  309 of 481 succeeded
    INFO  Overall score: 644351/1293183 (49.83%)
    INFO  1841 of 3040 succeeded

For comparison, healthcheck before applying this patch returns:

    INFO  Mainstream score: 140604/1237544 (11.36%)
    INFO  383 of 1825 succeeded
    INFO  Government score: 15919/47459 (33.54%)
    INFO  279 of 734 succeeded
    INFO  Detailed score: 3488/8180 (42.64%)
    INFO  133 of 481 succeeded
    INFO  Overall score: 160011/1293183 (12.37%)
    INFO  795 of 3040 succeeded

And, healthcheck on the old api returns:

    INFO  Mainstream score: 835747/1237544 (67.53%)
    INFO  1383 of 1825 succeeded
    INFO  Government score: 27332/47459 (57.59%)
    INFO  431 of 734 succeeded
    INFO  Detailed score: 7030/8180 (85.94%)
    INFO  405 of 481 succeeded
    INFO  Overall score: 870109/1293183 (67.28%)
    INFO  2219 of 3040 succeeded