Refactor|libcommon: Consolidated more map progression selection logics