Filter and sort extras

Do not use _almost all_ extras.