fix broken requests for service  management page
Merge remote-tracking branch 'origin/develop' into develop