[task] fixed sonar bugs