Fixed router id query after registry refactor.