Better heuristic implementation and bugfix in BestSelector