Removed some TODO items
Updated all controllers to use the new filter system