Include filled classes on manual sort