Several Bugfixes in selectionMechanism