Making both container and query filters work