Improve pie and trends panels ...

... so that the query coming from the query string panel does not override the predefined queries but is only used as an additional query filter