SONAR-4851 Pin selected items
SONAR-4851 3rd feedback changes