Finished refactoring code to properly handle filtering, and in general, all changes that can be made to the fetched results controller.