More bugfixes for selection