SONAR-4421 Improve assign box