Sure... but later please. / #5040

Currently the filter code is really ugly. The complete query code needs to be refactored. It will not be that hard, now that we know, what it required. If we add more and more filters those parts will cause work because we need to change this later.

I moved this task to v0.085 - refactor query filters