Update for new Completer world order.
No need to filter first.