Only use activity filters when we need to