Make single select work again. Fixes #13402