Fix UnsupportedOperationException and parallelism bug in EngineSelector