Properly filter queries for histograms with marker queries

Those queries are made up of multiple types. The previous flow resulted
in only filtering what comes last, currently the marker query.
Add a header that allows for easy debugging of resulting ES queries

It's commented out, as it supplies information for a possible negation filter.
Merge pull request #14 from volter/master

Bug fix for compound queries and a header for easier debugging