data-server repairs for get responses
Merge pull request #1759 from birarda/master

data-server repairs for get responses