Added @Filters
Playing with queries