update RetrieveFilterController

--I believe a finish to RetrieveFilterController, or at least a start