Code cleaning. Fixes to multi-select widgets