FQA-1845:update some issues after reviewed