Filtersedit

Queries and filters have been merged. Any query clause can now be used as a query in query context and as a filter in filter context (see Query DSL).