bug fix & add question handling logic