#520 wrong workspace pickup by endpoints for superuser.

Resolves #520