Feature/integrate question number

remove temp workaround!