[DS-1399] Adding supervisor order bug

This pull request is a modified version of the patch made by Jonathan Blood. The following one point is different from the original one.

1. Separate the cases when no workspace item exists and no workspace item is selected.