Significant improvements to select state handling