SIO-1170 better design to questions

Change-Id: I528008f72caad1cb1985bab061fbf480f339b01a