KRACOEUS-7734 fixing question maintenance partially
Merge pull request #561 from jhulslander/KRACOEUS-7734-questionss2

KRACOEUS-7734 fixing question maintenance partially