[AH-1736] fixed second layer selection
Sonar fixes