fix question and answer issues