     if upcomingSubjects.forWorkflow[workflow.id].length is 0
       # console.log 'Fetching subjects'
       subjectQuery =
-        project_id: project.id
         workflow_id: workflow.id
-        sort: 'cellect' unless SKIP_CELLECT
+        subject_set_id: subjectSet.id
+        sort: 'queued' unless SKIP_CELLECT
 
       fetchSubjects = apiClient.type('subjects').get subjectQuery
         .catch (error) ->

currentClassifications =
  forWorkflow: {}

# Quere up subjects to classify here.
# TODO: Should we clear this on sign-in and -out?
upcomingSubjects =
  forWorkflow: {}

Classifier = require '../../classifier'
alert = require '../../lib/alert'
SignInPrompt = require '../../partials/sign-in-prompt'
sessionSubjects = require '../../lib/session-subjects'

PROMPT_TO_SIGN_IN_AFTER = [5, 10, 25, 50, 100, 250, 500]

SKIP_CELLECT = location.search.match(/\Wcellect=0(?:\W|$)/)?

