review changes and fixes to selectable