Selection bugfixes