PLFENG-1449: Improve and fix feedbacks