Adjusted mapping to DeVariantSubjectIdx

Now the subject index is retrieved in the normal HD retrieval query
instead of being retrieved separately afterwards