Some fixes for selectionmodue (work in progress)
Some fixes for selectionmodue (work in progress)