Update caller filter to match core