Issue 18833: Fixed issues with overflow row and 'none' selections