datarouter node updates to address sonar issues