almost fixed the sorting, now keeps all stacks, minus x64 (reverted from commit 4594fcaeb96b16660c588557c978fc880742067a)
Merge remote-tracking branch 'origin/master'