KRACOEUS-8566 cleaning up question
Merge pull request #1313 from jhulslander/KRACOEUS-8566-questionId

KRACOEUS-8566 cleaning up question