fixes for selection