Moved filter logic into the filter

Now the filter interceptor only reports what comes in from the
query, and sends out the root object