quick fixes and further development of SelectionController