Move filter to underlying routine