fixes to selection