Revert "Small filter fetch update in the data controller."

This reverts commit 0bc6ea980735ce69d1ed2e7ae791f9b28378762d.
Synced the wrong way.
Synch with SAM