move filter to the top of the manager, organize mgr todos