Fixes for multi-selections