Fixes #182. Refactor REST services to not be so timing dependent.
Merge pull request #183 from kkasravi/issue_182

Fixes #182. Refactor REST services to not be so timing dependent.