refactor: runId handling in controller