Fixes to modal selection updates