Fix workload-based decision maker bug and refine