Fix non-faceted queries.

Add the workaround for Haystack issue 575 to avoid monkey-patching it.