Missing change from previous commit
Reorganize clusters loading to pickle.

In particular, 'ff' clusters are first filtered then framed, not the
other way around.