refs #87 fixed some sonar issues in the rest calls